Mercurial > hg
view hgext/share.py @ 9717:68a1b9d0663e
update: allow branch crossing without -c or -C, with no uncommitted changes
Update will now allow crossing branches within the same named branch,
when given a specific revision, if the working dir is clean, without
requiring the -c or -C option. Abort if no revision is given and
this would cross branches. Minor change to abort message if
uncommitted changes are found.
Modify test-update-branches and output to reflect the altered case. Modify
test-merge5.out to reflect the altered case. Modify
test-up-local-change.out with new message.
author | Stuart W Marks <smarks@smarks.org> |
---|---|
date | Thu, 05 Nov 2009 10:53:59 +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"