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

RE: Question about Branching/Merging practices

From: Reedick, Andrew <jr9445_at_ATT.COM>
Date: Thu, 13 Mar 2008 09:18:52 -0500

> -----Original Message-----
> From: Lars Grunewaldt [mailto:lgw_at_dark-reality.de]
> Sent: Thursday, March 13, 2008 7:02 AM
> To: subversion
> Subject: Question about Branching/Merging practices
> Wupps: this will lead to some conflicts, because we will actually
> re-"merge" the changes we merged from trunk to the branch in r111 into
> the trunk!
> But what can be done to avoid this? Is there a possibility to somehow
> make svn "ignore" changes that have been commited?
> Should we do two merges, like:
> svn merge -r100:110 svn://branch
> svn merge -r111:140 svn://branch

Yes. Multiple merges to skip the r111 is the solution.

> which would obviously ignore the merged changes from trunk, but leads
> to a LOT of work if more than one time in history changes have been
> merged from trunk to the branch?

Less work than fixing the spurious conflicts. I can't remember if
svnmerge.py helps in this regard or not.

IIRC, you also have to remember not to make any extra, non-merge related
changes during the initial merge to the branch. Otherwise, you won't
remember to merge them back to the trunk.

> Or is this use of svn merge simply
> wrong, and the whole scenario should be handled differently in the
> first place?

When it comes out, Subversion 1.5 should handle the situation correctly:

More fun 1.5 reading:


The information transmitted is intended only for the person or entity to which it is addressed and may contain confidential, proprietary, and/or privileged material. Any review, retransmission, dissemination or other use of, or taking of any action in reliance upon this information by persons or entities other than the intended recipient is prohibited. If you received this in error, please contact the sender and delete the material from all computers. GA621

To unsubscribe, e-mail: users-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: users-help_at_subversion.tigris.org
Received on 2008-03-13 15:20:17 CET

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.