Mercurial > hg
view tests/test-convert-bzr-treeroot.t @ 26677:e9b3d523f2e6
rebase: properly abort when destination is public (issue4896)
After rebasing a set of changes onto a public changeset and having the first one
be skipped, if you try to abort, the operation fails. This fix adds a check to
disallow the target rev into the dstates list within the abort function. This
list is checked for immutable states before the rest of abort does its thing.
author | Christian Delahousse <cdelahousse@fb.com> |
---|---|
date | Tue, 13 Oct 2015 14:06:51 -0700 |
parents | 89872688893f |
children | 75be14993fda |
line wrap: on
line source
#require bzr $ . "$TESTDIR/bzr-definitions" $ cat > treeset.py <<EOF > import sys > from bzrlib import workingtree > wt = workingtree.WorkingTree.open('.') > > message, rootid = sys.argv[1:] > wt.set_root_id('tree_root-%s' % rootid) > wt.commit(message) > EOF change the id of the tree root $ mkdir test-change-treeroot-id $ cd test-change-treeroot-id $ bzr init -q source $ cd source $ echo content > file $ bzr add -q file $ bzr commit -q -m 'Initial add' $ python ../../treeset.py 'Changed root' new $ cd .. $ hg convert source source-hg initializing destination source-hg repository scanning source... sorting... converting... 1 Initial add 0 Changed root $ manifest source-hg tip % manifest of tip 644 file $ cd ..