Re: [Tikiwiki-cvs/svn] SF.net SVN: tikiwiki:[22637] branches/4.x/

View: New views

4 Messages — Rating Filter: Alert me

	Re: [Tikiwiki-cvs/svn] SF.net SVN: tikiwiki:[22637] branches/4.x/ by Marc Laporte-3 :: Rate this Message: Reply to Author \| View Threaded \| Show Only this Message ok everyone! It's time to branch for real. we need to get the script merge 4x. -> branch to work M ;-) On Mon, Oct 26, 2009 at 7:52 AM, Jonny Bradley <tw@...> wrote: > > Ok, i'm afraid this is beyond me - i've spent some more time on it > this morning (etc) and the script to update trunk from stable doesn't > want to play... > > On a fresh checkout of trunk i run > > php doc/devtools/svnbranchupdate.php branches/4.x > > but i get 'Could not find previous merge. Impossible to merge > automatically.' > > Looking through the code it seems to need to find an instance of '4.x' > having been MRG'ed or BRANCH'ed in trunk, but if it's the first time > (like this) the BRANCH commit message is in 4.x, not in trunk. > > Sorry - i tried... > > jb > > > On 24 Oct 2009, at 21:04, Marc Laporte wrote: > >> Hi everyone! >> >> The jury is still out on how to best handle branch 4.x >> http://dev.tikiwiki.org/How+to+release#To_branch_or_not_to_branch >> and luci is adding a third option >> >> Thanks >> >> M ;-) >> >> >> On Sat, Oct 24, 2009 at 3:16 PM, Jonny Bradley <tw@...> >> wrote: >>> >>> hi all! >>> >>> At the moment this is just a test - DON'T PANIC! >>> >>> No one else seemed to be doing it, so i'm afraid i had a go, at least >>> at fixing the script - but testing it created the (a) branch. Woo! >>> >>> Let's assume this one will be deleted and we'll have another go >>> late - >>> conferring on irc meanwhile... >>> >>> jb >>> >>> On 24 Oct 2009, at 19:14, jonnybradley@... wrote: >>> >>>> Revision: 22637 >>>> http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=22637&view=rev >>>> Author: jonnybradley >>>> Date: 2009-10-24 18:14:48 +0000 (Sat, 24 Oct 2009) >>>> >>>> Log Message: >>>> ----------- >>>> [BRANCH] Creation, trunk 0 to 22636 >>>> >>>> Added Paths: >>>> ----------- >>>> branches/4.x/ >>>> >>>> >>>> This was sent by the SourceForge.net collaborative development >>>> platform, the world's largest Open Source development site. >>>> >>>> ------------------------------------------------------------------------------ >>>> Come build with us! The BlackBerry(R) Developer Conference in SF, CA >>>> is the only developer event you need to attend this year. Jumpstart >>>> your >>>> developing skills, take BlackBerry mobile applications to market and >>>> stay >>>> ahead of the curve. Join us from November 9 - 12, 2009. Register >>>> now! >>>> http://p.sf.net/sfu/devconference >>>> _______________________________________________ >>>> Tikiwiki-cvs mailing list >>>> Tikiwiki-cvs@... >>>> https://lists.sourceforge.net/lists/listinfo/tikiwiki-cvs >>> >>> >>> ------------------------------------------------------------------------------ >>> Come build with us! The BlackBerry(R) Developer Conference in SF, CA >>> is the only developer event you need to attend this year. Jumpstart >>> your >>> developing skills, take BlackBerry mobile applications to market >>> and stay >>> ahead of the curve. Join us from November 9 - 12, 2009. Register now! >>> http://p.sf.net/sfu/devconference >>> _______________________________________________ >>> Tikiwiki-cvs mailing list >>> Tikiwiki-cvs@... >>> https://lists.sourceforge.net/lists/listinfo/tikiwiki-cvs >>> >> >> >> >> -- >> Marc Laporte >> >> http://MarcLaporte.com >> http://TikiWiki.org/MarcLaporte >> http://AvanTech.net >> http://OurWiki.net >> >> ------------------------------------------------------------------------------ >> Come build with us! The BlackBerry(R) Developer Conference in SF, CA >> is the only developer event you need to attend this year. Jumpstart >> your >> developing skills, take BlackBerry mobile applications to market and >> stay >> ahead of the curve. Join us from November 9 - 12, 2009. Register now! >> http://p.sf.net/sfu/devconference >> _______________________________________________ >> Tikiwiki-cvs mailing list >> Tikiwiki-cvs@... >> https://lists.sourceforge.net/lists/listinfo/tikiwiki-cvs > > > ------------------------------------------------------------------------------ > Come build with us! The BlackBerry(R) Developer Conference in SF, CA > is the only developer event you need to attend this year. Jumpstart your > developing skills, take BlackBerry mobile applications to market and stay > ahead of the curve. Join us from November 9 - 12, 2009. Register now! > http://p.sf.net/sfu/devconference > _______________________________________________ > Tikiwiki-cvs mailing list > Tikiwiki-cvs@... > https://lists.sourceforge.net/lists/listinfo/tikiwiki-cvs > -- Marc Laporte http://MarcLaporte.com http://TikiWiki.org/MarcLaporte http://AvanTech.net http://OurWiki.net ------------------------------------------------------------------------------ Come build with us! The BlackBerry(R) Developer Conference in SF, CA is the only developer event you need to attend this year. Jumpstart your developing skills, take BlackBerry mobile applications to market and stay ahead of the curve. Join us from November 9 - 12, 2009. Register now! http://p.sf.net/sfu/devconference _______________________________________________ Tikiwiki-devel mailing list Tikiwiki-devel@... https://lists.sourceforge.net/lists/listinfo/tikiwiki-devel
	Re: [Tikiwiki-cvs/svn] SF.net SVN: tikiwiki:[22637] branches/4.x/ by Marc Laporte-3 :: Rate this Message: Reply to Author \| View Threaded \| Show Only this Message > we need to get the script merge 4x. -> branch to work > oups we need to get the script merge 4x. -> trunk to work ------------------------------------------------------------------------------ Come build with us! The BlackBerry(R) Developer Conference in SF, CA is the only developer event you need to attend this year. Jumpstart your developing skills, take BlackBerry mobile applications to market and stay ahead of the curve. Join us from November 9 - 12, 2009. Register now! http://p.sf.net/sfu/devconference _______________________________________________ Tikiwiki-devel mailing list Tikiwiki-devel@... https://lists.sourceforge.net/lists/listinfo/tikiwiki-devel
	Re: [Tikiwiki-cvs/svn] SF.net SVN: tikiwiki:[22637] branches/4.x/ by Marc Laporte-3 :: Rate this Message: Reply to Author \| View Threaded \| Show Only this Message In my tests, it doesn't matter if branch name is 4.x or 4.0, the script to merge from 4 to trunk is not happy. [demotw@alpha trunk2]$ php doc/devtools/svnbranchupdate.php branches/4.x Verifying... Updating... Merging... Could not find previous merge. Impossible to merge automatically. [demotw@alpha trunk2]$ php doc/devtools/svnbranchupdate.php branches/4.0 Verifying... Updating... Merging... Could not find previous merge. Impossible to merge automatically. On Mon, Nov 2, 2009 at 3:08 PM, Marc Laporte <marc@...> wrote: >> we need to get the script merge 4x. -> branch to work >> > > > oups > we need to get the script merge 4x. -> trunk to work > -- Marc Laporte http://MarcLaporte.com http://TikiWiki.org/MarcLaporte http://AvanTech.net http://OurWiki.net ------------------------------------------------------------------------------ Come build with us! The BlackBerry(R) Developer Conference in SF, CA is the only developer event you need to attend this year. Jumpstart your developing skills, take BlackBerry mobile applications to market and stay ahead of the curve. Join us from November 9 - 12, 2009. Register now! http://p.sf.net/sfu/devconference _______________________________________________ Tikiwiki-devel mailing list Tikiwiki-devel@... https://lists.sourceforge.net/lists/listinfo/tikiwiki-devel
	Re: [Tikiwiki-cvs/svn] SF.net SVN: tikiwiki:[22637] branches/4.x/ by Jonny Bradley-2 :: Rate this Message: Reply to Author \| View Threaded \| Show Only this Message Hi Marc and all 'festers! I had a go at this a while ago and got as far as getting the script to recognise 4.x as a stable branch (r22638) but it didn't seem to want to merge. I'll have another go today (but i am a bit lost!). jb On 3 Nov 2009, at 05:19, Marc Laporte wrote: > In my tests, it doesn't matter if branch name is 4.x or 4.0, the > script to merge from 4 to trunk is not happy. > > > [demotw@alpha trunk2]$ php doc/devtools/svnbranchupdate.php branches/ > 4.x > Verifying... > Updating... > Merging... > Could not find previous merge. Impossible to merge automatically. > > > [demotw@alpha trunk2]$ php doc/devtools/svnbranchupdate.php branches/ > 4.0 > Verifying... > Updating... > Merging... > Could not find previous merge. Impossible to merge automatically. > > > On Mon, Nov 2, 2009 at 3:08 PM, Marc Laporte <marc@...> > wrote: >>> we need to get the script merge 4x. -> branch to work >>> >> >> >> oups >> we need to get the script merge 4x. -> trunk to work >> > > > > -- > Marc Laporte > > http://MarcLaporte.com > http://TikiWiki.org/MarcLaporte > http://AvanTech.net > http://OurWiki.net > > ------------------------------------------------------------------------------ > Come build with us! The BlackBerry(R) Developer Conference in SF, CA > is the only developer event you need to attend this year. Jumpstart > your > developing skills, take BlackBerry mobile applications to market and > stay > ahead of the curve. Join us from November 9 - 12, 2009. Register now! > http://p.sf.net/sfu/devconference > _______________________________________________ > Tikiwiki-devel mailing list > Tikiwiki-devel@... > https://lists.sourceforge.net/lists/listinfo/tikiwiki-devel ------------------------------------------------------------------------------ Come build with us! The BlackBerry(R) Developer Conference in SF, CA is the only developer event you need to attend this year. Jumpstart your developing skills, take BlackBerry mobile applications to market and stay ahead of the curve. Join us from November 9 - 12, 2009. Register now! http://p.sf.net/sfu/devconference _______________________________________________ Tikiwiki-devel mailing list Tikiwiki-devel@... https://lists.sourceforge.net/lists/listinfo/tikiwiki-devel

	Re: [Tikiwiki-cvs/svn] SF.net SVN: tikiwiki:[22637] branches/4.x/ by Marc Laporte-3 :: Rate this Message: Reply to Author \| View Threaded \| Show Only this Message ok everyone! It's time to branch for real. we need to get the script merge 4x. -> branch to work M ;-) On Mon, Oct 26, 2009 at 7:52 AM, Jonny Bradley <tw@...> wrote: > > Ok, i'm afraid this is beyond me - i've spent some more time on it > this morning (etc) and the script to update trunk from stable doesn't > want to play... > > On a fresh checkout of trunk i run > > php doc/devtools/svnbranchupdate.php branches/4.x > > but i get 'Could not find previous merge. Impossible to merge > automatically.' > > Looking through the code it seems to need to find an instance of '4.x' > having been MRG'ed or BRANCH'ed in trunk, but if it's the first time > (like this) the BRANCH commit message is in 4.x, not in trunk. > > Sorry - i tried... > > jb > > > On 24 Oct 2009, at 21:04, Marc Laporte wrote: > >> Hi everyone! >> >> The jury is still out on how to best handle branch 4.x >> http://dev.tikiwiki.org/How+to+release#To_branch_or_not_to_branch >> and luci is adding a third option >> >> Thanks >> >> M ;-) >> >> >> On Sat, Oct 24, 2009 at 3:16 PM, Jonny Bradley <tw@...> >> wrote: >>> >>> hi all! >>> >>> At the moment this is just a test - DON'T PANIC! >>> >>> No one else seemed to be doing it, so i'm afraid i had a go, at least >>> at fixing the script - but testing it created the (a) branch. Woo! >>> >>> Let's assume this one will be deleted and we'll have another go >>> late - >>> conferring on irc meanwhile... >>> >>> jb >>> >>> On 24 Oct 2009, at 19:14, jonnybradley@... wrote: >>> >>>> Revision: 22637 >>>> http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=22637&view=rev >>>> Author: jonnybradley >>>> Date: 2009-10-24 18:14:48 +0000 (Sat, 24 Oct 2009) >>>> >>>> Log Message: >>>> ----------- >>>> [BRANCH] Creation, trunk 0 to 22636 >>>> >>>> Added Paths: >>>> ----------- >>>> branches/4.x/ >>>> >>>> >>>> This was sent by the SourceForge.net collaborative development >>>> platform, the world's largest Open Source development site. >>>> >>>> ------------------------------------------------------------------------------ >>>> Come build with us! The BlackBerry(R) Developer Conference in SF, CA >>>> is the only developer event you need to attend this year. Jumpstart >>>> your >>>> developing skills, take BlackBerry mobile applications to market and >>>> stay >>>> ahead of the curve. Join us from November 9 - 12, 2009. Register >>>> now! >>>> http://p.sf.net/sfu/devconference >>>> _______________________________________________ >>>> Tikiwiki-cvs mailing list >>>> Tikiwiki-cvs@... >>>> https://lists.sourceforge.net/lists/listinfo/tikiwiki-cvs >>> >>> >>> ------------------------------------------------------------------------------ >>> Come build with us! The BlackBerry(R) Developer Conference in SF, CA >>> is the only developer event you need to attend this year. Jumpstart >>> your >>> developing skills, take BlackBerry mobile applications to market >>> and stay >>> ahead of the curve. Join us from November 9 - 12, 2009. Register now! >>> http://p.sf.net/sfu/devconference >>> _______________________________________________ >>> Tikiwiki-cvs mailing list >>> Tikiwiki-cvs@... >>> https://lists.sourceforge.net/lists/listinfo/tikiwiki-cvs >>> >> >> >> >> -- >> Marc Laporte >> >> http://MarcLaporte.com >> http://TikiWiki.org/MarcLaporte >> http://AvanTech.net >> http://OurWiki.net >> >> ------------------------------------------------------------------------------ >> Come build with us! The BlackBerry(R) Developer Conference in SF, CA >> is the only developer event you need to attend this year. Jumpstart >> your >> developing skills, take BlackBerry mobile applications to market and >> stay >> ahead of the curve. Join us from November 9 - 12, 2009. Register now! >> http://p.sf.net/sfu/devconference >> _______________________________________________ >> Tikiwiki-cvs mailing list >> Tikiwiki-cvs@... >> https://lists.sourceforge.net/lists/listinfo/tikiwiki-cvs > > > ------------------------------------------------------------------------------ > Come build with us! The BlackBerry(R) Developer Conference in SF, CA > is the only developer event you need to attend this year. Jumpstart your > developing skills, take BlackBerry mobile applications to market and stay > ahead of the curve. Join us from November 9 - 12, 2009. Register now! > http://p.sf.net/sfu/devconference > _______________________________________________ > Tikiwiki-cvs mailing list > Tikiwiki-cvs@... > https://lists.sourceforge.net/lists/listinfo/tikiwiki-cvs > -- Marc Laporte http://MarcLaporte.com http://TikiWiki.org/MarcLaporte http://AvanTech.net http://OurWiki.net ------------------------------------------------------------------------------ Come build with us! The BlackBerry(R) Developer Conference in SF, CA is the only developer event you need to attend this year. Jumpstart your developing skills, take BlackBerry mobile applications to market and stay ahead of the curve. Join us from November 9 - 12, 2009. Register now! http://p.sf.net/sfu/devconference _______________________________________________ Tikiwiki-devel mailing list Tikiwiki-devel@... https://lists.sourceforge.net/lists/listinfo/tikiwiki-devel
	Re: [Tikiwiki-cvs/svn] SF.net SVN: tikiwiki:[22637] branches/4.x/ by Marc Laporte-3 :: Rate this Message: Reply to Author \| View Threaded \| Show Only this Message > we need to get the script merge 4x. -> branch to work > oups we need to get the script merge 4x. -> trunk to work ------------------------------------------------------------------------------ Come build with us! The BlackBerry(R) Developer Conference in SF, CA is the only developer event you need to attend this year. Jumpstart your developing skills, take BlackBerry mobile applications to market and stay ahead of the curve. Join us from November 9 - 12, 2009. Register now! http://p.sf.net/sfu/devconference _______________________________________________ Tikiwiki-devel mailing list Tikiwiki-devel@... https://lists.sourceforge.net/lists/listinfo/tikiwiki-devel
	Re: [Tikiwiki-cvs/svn] SF.net SVN: tikiwiki:[22637] branches/4.x/ by Marc Laporte-3 :: Rate this Message: Reply to Author \| View Threaded \| Show Only this Message In my tests, it doesn't matter if branch name is 4.x or 4.0, the script to merge from 4 to trunk is not happy. [demotw@alpha trunk2]$ php doc/devtools/svnbranchupdate.php branches/4.x Verifying... Updating... Merging... Could not find previous merge. Impossible to merge automatically. [demotw@alpha trunk2]$ php doc/devtools/svnbranchupdate.php branches/4.0 Verifying... Updating... Merging... Could not find previous merge. Impossible to merge automatically. On Mon, Nov 2, 2009 at 3:08 PM, Marc Laporte <marc@...> wrote: >> we need to get the script merge 4x. -> branch to work >> > > > oups > we need to get the script merge 4x. -> trunk to work > -- Marc Laporte http://MarcLaporte.com http://TikiWiki.org/MarcLaporte http://AvanTech.net http://OurWiki.net ------------------------------------------------------------------------------ Come build with us! The BlackBerry(R) Developer Conference in SF, CA is the only developer event you need to attend this year. Jumpstart your developing skills, take BlackBerry mobile applications to market and stay ahead of the curve. Join us from November 9 - 12, 2009. Register now! http://p.sf.net/sfu/devconference _______________________________________________ Tikiwiki-devel mailing list Tikiwiki-devel@... https://lists.sourceforge.net/lists/listinfo/tikiwiki-devel
	Re: [Tikiwiki-cvs/svn] SF.net SVN: tikiwiki:[22637] branches/4.x/ by Jonny Bradley-2 :: Rate this Message: Reply to Author \| View Threaded \| Show Only this Message Hi Marc and all 'festers! I had a go at this a while ago and got as far as getting the script to recognise 4.x as a stable branch (r22638) but it didn't seem to want to merge. I'll have another go today (but i am a bit lost!). jb On 3 Nov 2009, at 05:19, Marc Laporte wrote: > In my tests, it doesn't matter if branch name is 4.x or 4.0, the > script to merge from 4 to trunk is not happy. > > > [demotw@alpha trunk2]$ php doc/devtools/svnbranchupdate.php branches/ > 4.x > Verifying... > Updating... > Merging... > Could not find previous merge. Impossible to merge automatically. > > > [demotw@alpha trunk2]$ php doc/devtools/svnbranchupdate.php branches/ > 4.0 > Verifying... > Updating... > Merging... > Could not find previous merge. Impossible to merge automatically. > > > On Mon, Nov 2, 2009 at 3:08 PM, Marc Laporte <marc@...> > wrote: >>> we need to get the script merge 4x. -> branch to work >>> >> >> >> oups >> we need to get the script merge 4x. -> trunk to work >> > > > > -- > Marc Laporte > > http://MarcLaporte.com > http://TikiWiki.org/MarcLaporte > http://AvanTech.net > http://OurWiki.net > > ------------------------------------------------------------------------------ > Come build with us! The BlackBerry(R) Developer Conference in SF, CA > is the only developer event you need to attend this year. Jumpstart > your > developing skills, take BlackBerry mobile applications to market and > stay > ahead of the curve. Join us from November 9 - 12, 2009. Register now! > http://p.sf.net/sfu/devconference > _______________________________________________ > Tikiwiki-devel mailing list > Tikiwiki-devel@... > https://lists.sourceforge.net/lists/listinfo/tikiwiki-devel ------------------------------------------------------------------------------ Come build with us! The BlackBerry(R) Developer Conference in SF, CA is the only developer event you need to attend this year. Jumpstart your developing skills, take BlackBerry mobile applications to market and stay ahead of the curve. Join us from November 9 - 12, 2009. Register now! http://p.sf.net/sfu/devconference _______________________________________________ Tikiwiki-devel mailing list Tikiwiki-devel@... https://lists.sourceforge.net/lists/listinfo/tikiwiki-devel