Mercurial > hg-stable
view hgext/share.py @ 10251:a19d2993385d stable
subrepo: fix merging of already merged subrepos (issue1986)
This fixes a bug seen when merging a main repo which contains a subrepo when
both repos have been merged before. Each repo (main and sub) has two
branches, both of which have been merged before.
In a subrepo, if the revision to merge to is an ancestor of the current rev,
then the merge should be a noop.
Test provided by Steve Losh.
author | Benoit Boissinot <benoit.boissinot@ens-lyon.org> |
---|---|
date | Fri, 15 Jan 2010 21:08:04 +0100 |
parents | 4b8b0c124b99 |
children | 279c8a73fde1 |
line wrap: on
line source
# 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"