Mercurial > hg
view contrib/convert-repo @ 9954:d6a307719ccb stable
fix bug in prepush logic involving merge changesets
When creating new branches and merging them into existing ones, you would
sometimes be able to push some changesets (the existing branches) without using
--force, even when that creates a new head on the remote.
A test which triggers the error has been added.
author | Sune Foldager <cryo@cyanite.org> |
---|---|
date | Mon, 30 Nov 2009 14:58:52 +0100 |
parents | 1d3eb332f3cb |
children |
line wrap: on
line source
#!/usr/bin/env python # # Wrapper script around the convert.py hgext extension # for foreign SCM conversion to mercurial format. # import sys from mercurial import ui, fancyopts from hgext import convert # Options extracted from the cmdtable func, options, help = convert.cmdtable['convert'] # An ui instance u = ui.ui() opts = {} args = [] try: args = list(fancyopts.fancyopts(sys.argv[1:], options, opts)) args += [None]*(3 - len(args)) src, dest, revmapfile = args except (fancyopts.getopt.GetoptError, ValueError), inst: u.warn('Usage:\n%s\n' % help) sys.exit(-1) convert.convert(u, src, dest, revmapfile, **opts)