Jason Johnson wrote:
On Tue, Mar 31, 2009 at 4:44 PM, Frank Shearar frank.shearar@angband.za.org wrote:
That cherry-picking business of darcs', though: man, that just
rocks. When
you say "darcs record" it walks you through the hunks in a file, and
you can
just say "yes, I'll record this hunk, no, not that hunk". (I'd
dearly love
to see something like this in MC!)
I thought MC2 could work from change sets? If so, you have this now and with an even handier interface. Just arrange the change sets how you want them with the change sorter, then commit it with MC2. Am I correct?
Sort of. Yes, you could do that.
But if what you want is cherry picking, MC2 supports that with packages as well. When doing a merge you always have the option to choose which changes to apply. A normal, non-cherry-picking merge is just the degenerate case where you choose to apply all the changes.
Colin