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

Re: [PATCH] 'svnmerge' tool for automating merges

From: Archie Cobbs <archie_at_dellroad.org>
Date: 2004-09-28 21:35:38 CEST

Bruce A. Mah wrote:
> > Attached is a tool called "svnmerge" that we're using locally to
> > automatically track merges from our trunk to branches. It stores the
> > merged-in revisions as a list in a property on the branch directory.
> One minor comment so far: You're pretty insistent in check_branch_dir()
> on having a totally clean WC before doing an init or merge operation.
> Seems to me you could be a teensy bit more forgiving without sacrificing
> correctness, I am thinking particularly of the case of unversioned files
> in the WC such as compiled object files. Maybe use the "-q" option in
> the second invocation of svn stat?

Yes, I did that because the merge will fail if a file that is added
in the merge also already exists (unversioned) in the branch tree.
The workaround is to put such files in svn:ignore. However, I agree
this is pretty conservative behavior, so maybe just letting the merge
fail and leaving it up to the user to fix is better.

On the other hand, having outstanding changes to versioned files (as
opposed to extra, unversioned files) is a much more serious threat to
the process.. because you could unwittingly "merge" in a change that
never existed in the head branch. That's much more important to guard

Another thought I had is that it would be nice if it could auto-detect
any "empty" merges, i.e., commits that don't affect the head branch,
and go ahead and merge them in. Otherwise, they just clutter up the
list of outstanding merges, obfuscating the non-empty changes; right
now you have to manually include them in your merge list.

Also, I created a little web page...


Thanks for the suggestions and for testing it out!


Archie Cobbs * CTO, Awarix * http://www.awarix.com

To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Tue Sep 28 21:45:38 2004

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.