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

Re: question on svn merge without revision numbers

From: Raman Gupta <rocketraman_at_fastmail.fm>
Date: 2007-07-25 00:10:03 CEST

Raman Gupta wrote:
> Brummer, Byron wrote:
>> Personally I merge one rev at a time, separately committed using the
>> original's log message (and info) so that I know where the merged
>> changes actually came from. The new merge tracking features may help
>> this; I haven't had a chance to play with them yet.
> Ouch -- why maintain your own script when this is exactly what
> svnmerge.py will do for you. svnmerge.py will even create your commit
> message including the log of each revision that is being merged. And
> it'll only get better with svn 1.5 -- I think there was some talk on
> the dev list about migrating svnmerge.py properties to svn 1.5 merging
> meta-data automatically.

BTW, I didn't mean to imply that svnmerge.py will always merge one rev
at a time! Though Byron can make it do that if he wants to by passing
the -r argument, it is not the normal behavior.

Raman Gupta

To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Wed Jul 25 00:09:07 2007

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.