diff options
author | Lorry Tar Creator <lorry-tar-importer@baserock.org> | 2011-10-01 20:49:36 +0000 |
---|---|---|
committer | Lorry <lorry@roadtrain.codethink.co.uk> | 2012-09-27 13:27:51 +0000 |
commit | 921ced43c48c1d170452a7b251b94cc96ec8dd44 (patch) | |
tree | 3c4a89176ea67fe4c7bf7b375488361a823c95fa /tests/test-filebranch.t | |
parent | 9039c805b0a7e36220101323f82735f08a104b37 (diff) | |
download | mercurial-tarball-master.tar.gz |
Imported from /srv/lorry/lorry-area/mercurial-tarball/mercurial-1.9.3.tar.gz.HEADmercurial-1.9.3master
Diffstat (limited to 'tests/test-filebranch.t')
-rw-r--r-- | tests/test-filebranch.t | 39 |
1 files changed, 19 insertions, 20 deletions
diff --git a/tests/test-filebranch.t b/tests/test-filebranch.t index 5558fb0..2c4057a 100644 --- a/tests/test-filebranch.t +++ b/tests/test-filebranch.t @@ -76,11 +76,11 @@ We shouldn't have anything but foo in merge state here: main: we should have a merge here: $ hg debugindex --changelog - rev offset length ..... linkrev nodeid p1 p2 (re) - 0 0 73 ..... 0 cdca01651b96 000000000000 000000000000 (re) - 1 73 68 ..... 1 f6718a9cb7f3 cdca01651b96 000000000000 (re) - 2 141 68 ..... 2 bdd988058d16 cdca01651b96 000000000000 (re) - 3 209 66 ..... 3 d8a521142a3c f6718a9cb7f3 bdd988058d16 (re) + rev offset length base linkrev nodeid p1 p2 + 0 0 73 0 0 cdca01651b96 000000000000 000000000000 + 1 73 68 1 1 f6718a9cb7f3 cdca01651b96 000000000000 + 2 141 68 2 2 bdd988058d16 cdca01651b96 000000000000 + 3 209 66 3 3 d8a521142a3c f6718a9cb7f3 bdd988058d16 log should show foo and quux changed: @@ -100,32 +100,32 @@ log should show foo and quux changed: foo: we should have a merge here: $ hg debugindex foo - rev offset length ..... linkrev nodeid p1 p2 (re) - 0 0 3 ..... 0 b8e02f643373 000000000000 000000000000 (re) - 1 3 4 ..... 1 2ffeddde1b65 b8e02f643373 000000000000 (re) - 2 7 4 ..... 2 33d1fb69067a b8e02f643373 000000000000 (re) - 3 11 4 ..... 3 aa27919ee430 2ffeddde1b65 33d1fb69067a (re) + rev offset length base linkrev nodeid p1 p2 + 0 0 3 0 0 b8e02f643373 000000000000 000000000000 + 1 3 4 1 1 2ffeddde1b65 b8e02f643373 000000000000 + 2 7 4 2 2 33d1fb69067a b8e02f643373 000000000000 + 3 11 4 3 3 aa27919ee430 2ffeddde1b65 33d1fb69067a bar: we should not have a merge here: $ hg debugindex bar - rev offset length ..... linkrev nodeid p1 p2 (re) - 0 0 3 ..... 0 b8e02f643373 000000000000 000000000000 (re) - 1 3 4 ..... 2 33d1fb69067a b8e02f643373 000000000000 (re) + rev offset length base linkrev nodeid p1 p2 + 0 0 3 0 0 b8e02f643373 000000000000 000000000000 + 1 3 4 1 2 33d1fb69067a b8e02f643373 000000000000 baz: we should not have a merge here: $ hg debugindex baz - rev offset length ..... linkrev nodeid p1 p2 (re) - 0 0 3 ..... 0 b8e02f643373 000000000000 000000000000 (re) - 1 3 4 ..... 1 2ffeddde1b65 b8e02f643373 000000000000 (re) + rev offset length base linkrev nodeid p1 p2 + 0 0 3 0 0 b8e02f643373 000000000000 000000000000 + 1 3 4 1 1 2ffeddde1b65 b8e02f643373 000000000000 quux: we should not have a merge here: $ hg debugindex quux - rev offset length ..... linkrev nodeid p1 p2 (re) - 0 0 3 ..... 0 b8e02f643373 000000000000 000000000000 (re) - 1 3 5 ..... 3 6128c0f33108 b8e02f643373 000000000000 (re) + rev offset length base linkrev nodeid p1 p2 + 0 0 3 0 0 b8e02f643373 000000000000 000000000000 + 1 3 5 1 3 6128c0f33108 b8e02f643373 000000000000 Manifest entries should match tips of all files: @@ -146,4 +146,3 @@ Everything should be clean now: checking files 4 files, 4 changesets, 10 total revisions - $ cd .. |