Brummer, Byron wrote:
>> Almost all the documentation I've seen on svn merge suggests
>> using a revision number for things to merge. Is this really necessary?
>
> Yes.
Actually no. Try using the latest svnmerge.py instead.
>> What are the issues that make the svn documentation focus so heavily
>> on doing merges by revision number? If your branch has 20 revisions,
>> doesn't it get painful to have to do a separate merge command for each
>> revision?
>
> Script it out.
>
> 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.
Cheers,
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:01:32 2007