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

Re: What do you Hate about Subversion?

From: Raman Gupta <rocketraman_at_fastmail.fm>
Date: 2007-01-18 14:41:21 CET

B. Smith-Mannschott wrote:
> (*) The lack of merge tracking. Yes, I've tried to wrap my brain
> around svnmerge.py, I can make it work, but I've never quite
> understood how to use bidirectional merging.

Bidirectional merging in svnmerge.py is nothing more than simple
unidirectional merging x 2, with the -b flag specified. That is to
say, init both branches as if you were doing unidirectional merging,
and then just specify the -b flag whenever you run the "avail" or
"merge" commands.

Cheers,
Raman

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Thu Jan 18 14:42:06 2007

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