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

RE: Questions about Subversion...

From: Mcgee, Mark <mark.mcgee_at_credit-suisse.com>
Date: Tue, 8 Jul 2008 16:58:35 +0100

> The raised question was about merging more than about
> branching and the "gotchas" around it. Can you give me any
> insight as to what those might be?
> The person in who raised it didn't go into details.

Merging in SVN doesn't work how most people new to SVN think (I was the
same). You can merge code between any two revisions of the repository -
remember branches are nothing more than a copy to an arbitrary "branch"
directory (with some ancestry kept if you do the "branch" properly), so
merging between branches or between revision 10 and revision 20 are no
different it's just a "diff" that gets applied to a working copy of the
files somewhere.

Again, the best advice I can give is to read the red bean book. It
covers any "gotchas", such attempting to re-merge the same changes to
the same code. See
http://svnbook.red-bean.com/en/1.1/ch04s03.html#svn-ch-4-sect-3.3 - will
be useful for you to read the whole chapter anyway, but this "gotcha" in
particular is described in the "Tracking Merges Manually" section.

My understanding is that SVN v1.5.0 tries to address this problem,
though I have to admit to not being particularly up to date as I use
1.4.6 quite happily and haven't looked to upgrade just yet.


Please access the attached hyperlink for an important electronic communications disclaimer:


To unsubscribe, e-mail: users-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: users-help_at_subversion.tigris.org
Received on 2008-07-08 17:59:36 CEST

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.