[Svnmerge] Log of merges

Archie Cobbs archie at dellroad.org
Fri Nov 4 07:48:47 PST 2005


Giovanni Bajo wrote:
> I'll have to further investigate the needs of the maintainer. What I have
> understood is that, using svnmerge, he looses what he considers a valuable
> information, that is the multiple merge tags. With CVS, they were always around
> for obvious reasons, and he often uses the last 3/4 merge tags for diff
> operations and whatnot. I believe the typical questions are: "what was changed
> in this file since last merge?", "if I rollback to immediately after last
> merge, does this bug show up? What if I go back two merges? Or three?".
> 
> With CVS, you could answer this with things liks "cvs
> diff -rMYBRANCH_MERGE_20051022 foo.c", and "cvs up -rMYBRANCH_MERGE_20051014
> foo.c". You can almost do the same if you use multiple merge tags with SVN (the
> required command line is much longer, and this is being discussed right now in
> the dev subversion mailing list). With svnmerge, one has to manually inspect
> the full log of the branch to find the wanted revision numbers, and use those
> numbers. This is much more burdesome, especially if compared to a "svn ls" to
> get the merge tag names.
> 
> This is why I was proposing "svnmerge log": we do the tedious work of finding
> out the merges, and show those.

I'm still skeptical :-)

With CVS, merge tags must be added manually. I.e., "MYBRANCH_MERGE_20051022"
didn't just appear magically, someone had to put it there.

So why can't the SVN equivalent ("svn cp") be done in the SVN case?
It gives the same result - an easy way to see changes subsequent to
that merge, and an easy way to "checkout" the code at that tag.

-Archie

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



More information about the Svnmerge mailing list