[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: Fwd: svn1.5 seems to fail simple merge-tracking scenario

From: Mark Phippard <markphip_at_gmail.com>
Date: Fri, 20 Feb 2009 15:20:32 -0500

On Fri, Feb 20, 2009 at 3:10 PM, Bob Archer <Bob.Archer_at_amsi.com> wrote:
>> I wrote the text that was quoted, and it is not as absolute as has
>> been made out. You can still use the branch. The blog you were
>
> But you can't reintegrate it, right? Which kind of makes it unuseable.

Sure you can. This works:

$ svn co ^/branch1
$ svn ci -m "work on branch"
$ svn merge ^/trunk
$ svn ci -m "Catch up with trunk"

On trunk WC
$ svn merge --reintegrate ^/branch1
$ svn ci -m "Commit all work from branch1"
Committed revision 100

Back on branch1
$ svn merge --record-only -r100 ^/trunk
$ svn ci -m "Mark r100 as merged"

$ svn ci -m "More work on branch"
$ svn merge ^/trunk
$ svn ci -m "Catch back up with trunk"

Back on trunk

$ svn merge --reintegrate ^/branch1
$ svn ci -m "Commit all work from branch1"
Committed revision 200

Lather. rinse. repeat.

-- 
Thanks
Mark Phippard
http://markphip.blogspot.com/
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=1200368
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
Received on 2009-02-20 21:22:04 CET

This is an archived mail posted to the Subversion Users mailing list.