Didier Verna <didier(a)xemacs.org> writes:
That's exactly why I recommend in Patcher's doc to avoid
that
situation. I'm actually wondering if it's a good thing at all to perform
such commits to the main repo. My current policy is to ensure that my
copy of the repository is up to date, and then patch and commit right
away so as to avoid the need for merging.
You can also do this after the fact with Mercurial Queues.
Doing things the way you describe feels wrong to me because
you're
typically introducing information that is local to *you* into the main
repo: nobody else is interested in the fact that you committed in an
out-of-date copy of the main repo, and "fixed" this later on by merging.
Opinions differ on that:
http://changelog.complete.org/posts/586-Rebase-Considered-Harmful.html
--
Cheers =8-} Mike
Friede, Völkerverständigung und überhaupt blabla
_______________________________________________
XEmacs-Patches mailing list
XEmacs-Patches(a)xemacs.org
http://calypso.tux.org/cgi-bin/mailman/listinfo/xemacs-patches