Rev 3523: We need one more bit to test the other part. in http://bzr.arbash-meinel.com/branches/bzr/1.6-dev/lazy_revno
John Arbash Meinel
john at arbash-meinel.com
Thu Aug 7 19:28:42 BST 2008
At http://bzr.arbash-meinel.com/branches/bzr/1.6-dev/lazy_revno
------------------------------------------------------------
revno: 3523
revision-id: john at arbash-meinel.com-20080807182834-ky8vkhkhhpifu7ue
parent: john at arbash-meinel.com-20080807182449-q5d7119tdkitmayx
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: lazy_revno
timestamp: Thu 2008-08-07 13:28:34 -0500
message:
We need one more bit to test the other part.
If we remove only parents that are not in the ancestry, it causes
the staging branch to appear to be descended from the feature branch
(its left-hand parent is removed, so the feature becomes the parent)
This only shows up when numbering another child, which should be
preserved on the same 'branch'.
-------------- next part --------------
=== modified file 'bzrlib/tests/test_graph.py'
--- a/bzrlib/tests/test_graph.py 2008-08-07 18:24:49 +0000
+++ b/bzrlib/tests/test_graph.py 2008-08-07 18:28:34 +0000
@@ -722,18 +722,20 @@
# h p | # feature 2 continues
# | | |
# i q |
-# | \|
-# | z # And feature 2 is merged via staging
-# | /
+# | |\|
+# | | z # And feature 2 is merged via staging
+# | :/
# | /
+# |/:
+# j r # And then one more time directly
# |/
-# j
+# k
#
staging = {'a':[NULL_REVISION], 'b':['a'], 'c':['b'], 'd':['c'],
'e':['d', 'y'], 'f':['e'], 'g':['f'], 'h':['g', 'o'], 'i':['h'],
- 'j':['i', 'z'],
+ 'j':['i', 'z'], 'k':['j', 'r'],
'm':['b'], 'n':['m'],
- 'o':['f'], 'p':['o'], 'q':['p'],
+ 'o':['f'], 'p':['o'], 'q':['p'], 'r':['q'],
'y':['d', 'n'], 'z':['y', 'q']
}
@@ -1822,7 +1824,7 @@
self.assertAllDottedRevno(alt_with_ghost, 'c')
def test_get_dotted_revno_staging(self):
- self.assertAllDottedRevno(staging, 'j')
+ self.assertAllDottedRevno(staging, 'k')
def test_get_dotted_revno_with_shortcut(self):
self.assertAllDottedRevno(shortcut_extra_root, 'f')
More information about the bazaar-commits
mailing list