rebase: make sure the newancestor is used during the whole update
(
issue1561)
Before this change, newancestor was used only once as a replacement
for ancestor.ancestor, but merge.update calls ancestor.ancestor
several times, so it ends up with the "wrong" ancestor (the real
ancestor, but we want the parent of the rebased changeset for all but
the first rebased changeset).
Added a new test case for this: test-rebase-newancestor.
Also, in one scenario in test-rebase-collapse, there was a spurious
conflict caused by the same issue, so that test case was fixed by
removing the now unneeded conflict resolution and the output was
adapted accordingly.
# Copyright 2006, 2007 Matt Mackall <mpm@selenic.com>
#
# This software may be used and distributed according to the terms of the
# GNU General Public License version 2, incorporated herein by reference.
'''share a common history between several working directories'''
from mercurial.i18n import _
from mercurial import hg, commands
def share(ui, source, dest=None, noupdate=False):
"""create a new shared repository (experimental)
Initialize a new repository and working directory that shares its
history with another repository.
NOTE: actions that change history such as rollback or moving the
source may confuse sharers.
"""
return hg.share(ui, source, dest, not noupdate)
cmdtable = {
"share":
(share,
[('U', 'noupdate', None, _('do not create a working copy'))],
_('[-U] SOURCE [DEST]')),
}
commands.norepo += " share"