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

Re: Question regarding merging branches

From: Dylan Cuthbert <dylan_at_q-games.com>
Date: 2002-09-10 04:17:29 CEST

"Ben Collins-Sussman" <sussman@collab.net> wrote in message
> "Dylan Cuthbert" <dylan@q-games.com> writes:
> > It seems that this kind of patching will generate bugs because it is
> > "piecemeal". ie. parts of the file get updated because there's no clash,
> > other parts don't because there is. However, the parts that do get
> > might rely on the changes in the clashing parts. (as they are all in the
> > same file)
> This is not a new model; CVS has been doing this for 15 years.

Yep, I know that, sorry, the original mail I was responding to described it
a little incorrectly and I took it literally, but once I specify the exact
branch and head revisions when I use the merge command from the parent
directory I do get the conflict, so all's fine and dandy. I have no problem
with that behaviour.

The cause of the confusion were a no. of user-interface issues, one was the
fact you have to specify the branch and head revisions manually, I think
this should be automatic and per file (in case individual files have been
copied/branched), it should be possible to search back for a common branch
point, or maybe it should be a standard meta-data for all files/directories
so you can enter something like "svn branched <file/dir>" and that lets svn
know the branch is on that revision. Of course, I'm new to this list, so
you've probably discussed this problem and already found a solution and its
just not implemented yet?

Anyway, when I tried to use the merge command without the "-r" I simply got
a partial update and conflicts were ignored, and it was confusing.

The other problem was the "." directory specification not working when
attempting a merge *with* the -r option. So I was stuck in a bit of a loop
until I found it works from the parent directory.


Q-Games, Dylan Cuthbert.
P2P internet radio - http://www.peercast.org

To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Tue Sep 10 04:21:21 2002

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

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