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

Re: [PATCH] Add ability to mark change sets as merged

From: David James <djames_at_collab.net>
Date: 2006-03-25 02:47:54 CET

On 3/24/06, Daniel Rall <dlr@collab.net> wrote:
> This is effectively a way to manipulate the merge memory stored in the
> "svnmerge-integrated" property. It's the flip-side of the 'block'
> concept.

Excellent work, Dan! I'm especially impressed with your clearly
spelled out use cases. Feel free to commit.

If further feedback from the svnmerge list determines we want to make
tweaks to the names of the command-line options, we can make them as
needed.

( svnmerge developers, see http://svn.haxx.se/dev/archive-2006-03/1097.shtml
for Dan's original post, which hasn't shown up on the svnmerge list yet. )

> Use case: A change set which is sufficiently different when backported
> that use of 'svn merge' is no longer appropriate.

This happens to me all the time! When I merge from trunk to 1.3.x, I
often run into conflicts, so I create a temporary merge branch. If I
tried to merge from the temporary merge branch to 1.3.x, the merge
metadata would be lost because svnmerge.py does not track indirect
metadata. To correct this metadata, I'd use svnmerge.py merge
--memory.

As a side note, I'm hoping to extend svnmerge.py to track metadata
across merge branches, but this is quite tricky to implement
correctly.

> [snip clearly spelled out use cases ]

> p.s. On a related note, I've got 'svnmerge.py rollback [--memory]'
> stubbed out too.

Great! This will be a very useful feature. I'm looking forward to your patch.

Cheers,

David

--
David James -- http://www.cs.toronto.edu/~james
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Sat Mar 25 02:48:31 2006

This is an archived mail posted to the Subversion Dev mailing list.