Mercurial > hg
view tests/test-convert-bzr-treeroot.t @ 47435:e9fbf8fd5f33
histedit: don't swallow errors that happen when updating the working copy
Commit 34165875fa5d (histedit: limit updated and merging output to
important updates, 2016-02-03) added a call to
`ui.pushbuffer(labeled=True, errors=True)`. I don't know if there was
a reason for the `errors=True` (nor the `labeled=True` bit, which I
removed in the previous commit). It seems bad to just discard the
errors, so let's not do that. By not doing that, we can also remove a
workaround for the lack of errors from `test-removeemptydirs.t`.
Differential Revision: https://phab.mercurial-scm.org/D10882
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Fri, 18 Jun 2021 13:55:45 -0700 |
parents | 26127236b229 |
children |
line wrap: on
line source
#require bzr $ . "$TESTDIR/bzr-definitions" $ cat > treeset.py <<EOF > import sys > from breezy import workingtree > import breezy.bzr.bzrdir > wt = workingtree.WorkingTree.open('.') > > message, rootid = sys.argv[1:] > wt.set_root_id(b'tree_root-%s' % rootid.encode()) > wt.commit(message) > EOF change the id of the tree root $ mkdir test-change-treeroot-id $ cd test-change-treeroot-id $ brz init -q source $ cd source $ echo content > file $ brz add -q file $ brz 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 ..