Re: RFC: mtn split (Was: [Monotone-devel] Best practice using monotone)

[Nathaniel Smith]

On Fri, Aug 25, 2006 at 09:27:21AM +1000, Daniel Carosone wrote:
> On Thu, Aug 24, 2006 at 01:22:28PM -0500, Chad Walstrom wrote:
> > According to Justin's comment, which I think is right on,
> > you need to back out the changes in B completely.
> > 
> >         mtn disapprove B
> 
> Um, not what I'd suggest.
> 
> What I'd recommend in this case, instead, is to check out another copy
> of A, and apply just the fix you wanted from B (without the others).
> If this was something that could be separated from the others easily
> by filename, you might use pluck to help you get just that fix.

It doesn't need to be easily separated by filename -- pluck deposits
changes as uncommitted work in the current workspace.  You can then
make further edits (I like combining monotone.el's ability to show a
workspace diff with emacs's diff-mode's capability to selectively
revert hunks), use 'mtn revert', whatever, to select exactly what you
want before you commit.

-- Nathaniel

-- 
Linguistics is arguably the most hotly contested property in the academic
realm. It is soaked with the blood of poets, theologians, philosophers,
philologists, psychologists, biologists and neurologists, along with
whatever blood can be got out of grammarians. - Russ Rymer