[PATCH 2 of 2] rebase: preserve working directory parent (BC)

Angel Ezquerra ezquerra at gmail.com
Tue Oct 15 14:32:23 CDT 2013


El 14/10/2013 17:00, <pierre-yves.david at ens-lyon.org> escribió:
>
> # HG changeset patch
> # User Pierre-Yves David <pierre-yves.david at ens-lyon.org>
> # Date 1381759949 -7200
> #      Mon Oct 14 16:12:29 2013 +0200
> # Node ID b94e088ccbedbdcf407658f2e41305027ba58464
> # Parent  b24448b7d0e6e0b0d871871ddb40b68f95eee7c7
> rebase: preserve working directory parent (BC)
>
> Prior to this changeset, rebase always left the working directory as a
parent of
> the last rebased changeset. The is dubious when, before the rebase, the
working
> directory was not a parent of the tip most rebased changeset.
>
> With this changeset, we move the working directory back to its original
parent.
> If the original parent was rebased, we use it's successors.

I'm not necessarily against this change, but isn't this a backwards
incompatible change?

Angel
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://selenic.com/pipermail/mercurial-devel/attachments/20131015/9e97b7c1/attachment.html>


More information about the Mercurial-devel mailing list