contrib/debian/changelog
author Pierre-Yves David <pierre-yves.david@fb.com>
Mon, 08 Feb 2016 19:32:29 +0100
changeset 28139 5476a7a039c0
parent 26148 7f49efcaa9b4
child 28989 a8256e3701be
permissions -rw-r--r--
destutil: allow to specify an explicit source for the merge We can now specify from where the merge is performed. The experimental revset is updated to take revisions as argument, allowing to test the feature. This will become very useful for pick the 'rebase' default destination. For this reason, we also exclude all descendants from the rebased set from the candidate destinations. This descendants exclusion was not necessary for merge as default destination would not be picked from anything else than a head. I'm not super excited with the current error messages, but I would prefer to delay an overall messages rework once 'hg rebase' is done getting a default destination aligned with 'hg merge'.

mercurial (__VERSION__) unstable; urgency=medium

  * Automated build performed by upstream.

 -- Mercurial Devel <mercurial-devel@selenic.com>  __DATE__