On Sun, 2004-09-26 at 16:18, Archie Cobbs 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.
> I know there are other developments in this area in the works, so
> this may be of limited value (and I haven't been following this
> mailing list so my information is out of date). In any case, it has
> proven useful here while more integrated merge tracking is being
> worked on.
This is pretty nice! I haven't played with it very much yet but I just
forked off a task branch for something I'm working on, so I'm going to
give svnmerge a try in managing merges from its parent.
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?
Thanks for making this available!
PS. It sucks that we don't work in the same building anymore...in the
time it took me to write this up I could have walked over to your
office, told you in person, and maybe talked you into taking me on
another hundred dollar hamburger run. :-)
Received on Tue Sep 28 19:58:05 2004