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

Merge Tracking: What's next?

From: Daniel Rall <dlr_at_collab.net>
Date: 2006-11-15 19:28:32 CET

Heya Kamesh! With Madan working on propogation of merge history
during copy/move and me working on the merge conflict resolution
callback, I was hoping you'd be up for tackling the next major piece
of the end-to-end puzzle: eliding on the client-side, within the
working copy.

When setting merge info on a path within a WC, typically from an
'update', 'merge', or 'merge --record-only' operation, we need to
elide merge info on child paths up the tree as far as they need to go.

If you're up for this, would you send a description of specifically
how you think it should work to the dev list?

Thanks, Dan

  • application/pgp-signature attachment: stored
Received on Thu Nov 16 19:27:54 2006

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