Matthieu Moy <[EMAIL PROTECTED]> writes: > Stefan Reichör <[EMAIL PROTECTED]> writes: > >> I have merged that version now. Could you please prepare a patch for >> your improvements. I started merging to early. I thought, that the >> patches you sent depend on each other. I saw it to late that this is >> not the case. > > Just to argue a bit more: this is exactly the kind of thing that > modern revision control are made for (tracking history and patch > ancestry), that would be done automatically by using the tool, and > that you have to do by hand when using diff/patch.
It was not terribly hard to deal with this particular case. Pull patches from Stefan, notice a few conflicts, remove his version of the conflicted files, use C-x V = to see whether my changes still make sense, do M-x bzr-submit-patch again. If you're paranoid about staying out the way of upstream, all you have to do is set `bzr-patch-sent-action' to 'none or 'keep-patch, and your changes will be blown away after sending the patch. I dislike this behavior, so I have not made it the default. -- Michael Olson -- FSF Associate Member #652 -- http://www.mwolson.org/ Interests: Emacs Lisp, text markup, protocols -- Jabber: mwolson_at_hcoop.net /` |\ | | | IRC: mwolson on freenode.net: #hcoop, #muse, #PurdueLUG |_] | \| |_| Project involvement: Emacs, Muse, Planner, ERC, EMMS
pgpzul1m91pT7.pgp
Description: PGP signature
_______________________________________________ Dvc-dev mailing list [email protected] https://mail.gna.org/listinfo/dvc-dev
