This tweak to your test case also shows why you need to lookup the parent in tree '1' rather than tree '0':
=== modified file 'bzrlib/tests/blackbox/test_uncommit.py'
--- bzrlib/tests/blackbox/test_uncommit.py 2013-05-27 19:08:27 +0000
+++ bzrlib/tests/blackbox/test_uncommit.py 2013-05-28 08:33:31 +0000
@@ -330,4 +330,5 @@ wt.commit('initial commit', rev_id='a1') wt.remove(['a/b', 'a/c']) wt.commit('remove b and c', rev_id='a2')
+ wt.remove(['a']) self.run_bzr("uncommit --force test")
Specifically, we shouldn't care at all what is in the current working tree when we are updating the *basis* tree.
I don't know if we want to add that to the test or not, as it should be covered by the direct test.
This tweak to your test case also shows why you need to lookup the parent in tree '1' rather than tree '0': tests/blackbox/ test_uncommit. py' tests/blackbox/ test_uncommit. py 2013-05-27 19:08:27 +0000 tests/blackbox/ test_uncommit. py 2013-05-28 08:33:31 +0000
wt.commit( 'initial commit', rev_id='a1')
wt.remove( ['a/b', 'a/c'])
wt.commit( 'remove b and c', rev_id='a2')
self. run_bzr( "uncommit --force test")
=== modified file 'bzrlib/
--- bzrlib/
+++ bzrlib/
@@ -330,4 +330,5 @@
+ wt.remove(['a'])
Specifically, we shouldn't care at all what is in the current working tree when we are updating the *basis* tree.
I don't know if we want to add that to the test or not, as it should be covered by the direct test.