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

Re: Re: Question regarding merging branches

From: Dylan Cuthbert <dylan_at_q-games.com>
Date: 2002-09-10 03:53:18 CEST

"Bill Tutt" <rassilon@lyra.org> wrote in message
news:58C671173DB6174A93E9ED88DCB0883D05A1C2D4@red-msg-07.redmond.corp.micros
oft.com...
>
>
> > From: Dylan Cuthbert [mailto:dylan@q-games.com]
> >
> > Or maybe there's some subtlety that I'm missing again. :-)
> >
>
> Well, you do know what's been merged, and what generated conflicts.

Well, no, I don't get the conflict messages, I just get the U or the G
letter when I issue the merge command and the conflicting area is left the
same as the trunk version (because there are no local mods). I'd prefer to
have a C, and the culprit lines highlighted "cvs-style", preventing me being
able to commit until I resolve the problem. This behaviour isn't happening
in the current version. It merges all the changes from the branch into the
trunk that don't have conflicts, all conflicts are left as whatever the
trunk version is.

Regards

---------------------------------
Q-Games, Dylan Cuthbert.
http://www.q-games.com
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 03:57:54 2002

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