>>>>> "Alvaro" == Alvaro Herrera <[EMAIL PROTECTED]> writes:
Alvaro> Yeah, what I do is save the full diff somewhere, get the partial
diff
Alvaro> with filterdiff, save it to a tmp file, revert all changes, apply
the
Alvaro> partial diff, commit, apply the full diff back. Lather, rinse,
repeat.
Alvaro> It's truly cumbersome. It would be awesome to have an easier way
to do
Alvaro> it, something like
My solution would be to check out the same revision of the tree
elsewhere, without the changes, and gradually copy&commit the changes
from the first tree to the second tree, with the aid of tools like
vimdiff (and another one I can't remember right now that will work on
directories).
That way you can also test each revision before you commit it and make
sure it meets required standards, compiles ok, etc.
Generally when I do this, I find I make minor tweaks and improvements
at the same time.
You also never need to touch the good working copy of the tree. Not
until you are satisfied with the job at least.
No need to hack around with diff files or guess line numbers either.
--
Brian May <[EMAIL PROTECTED]>
_______________________________________________
Monotone-devel mailing list
[email protected]
http://lists.nongnu.org/mailman/listinfo/monotone-devel
