[PATCH 3 of 6] A test that will fail without heads -b

Eric Hopper hopper at omnifarious.org
Thu Jun 7 17:58:14 CDT 2007


# HG changeset patch
# User Eric Hopper <hopper at omnifarious.org>
# Date 1181256554 25200
# Node ID 7f10f536f11273b87721bf9e6ce83018f179ed50
# Parent  d8f52bfc3b38809aff35efb8a34a6347ba228af7
A test that will fail without heads -b

diff --git a/tests/test-bheads b/tests/test-bheads
new file mode 100755
--- /dev/null
+++ b/tests/test-bheads
@@ -0,0 +1,101 @@
+#!/bin/sh
+
+hg init a
+cd a
+echo 'root' >root
+hg add root
+hg commit -d '0 0' -u test -m "Adding root node"
+hg heads
+echo '-------'
+hg heads -b
+
+echo '======='
+echo 'a' >a
+hg add a
+hg branch a
+hg commit -d '1 0' -u test -m "Adding a branch"
+hg heads
+echo '-------'
+hg heads -b
+
+echo '======='
+hg update -C 0
+echo 'b' >b
+hg add b
+hg branch b
+hg commit -d '2 0' -u test -m "Adding b branch"
+hg heads
+echo '-------'
+hg heads -b
+
+echo '======='
+echo 'bh1' >bh1
+hg add bh1
+hg commit -d '3 0' -u test -m "Adding b branch head 1"
+hg heads
+echo '-------'
+hg heads -b
+
+echo '======='
+hg update -C 2
+echo 'bh2' >bh2
+hg add bh2
+hg commit -d '4 0' -u test -m "Adding b branch head 2"
+hg heads
+echo '-------'
+hg heads -b
+
+echo '======='
+hg update -C 2
+echo 'bh3' >bh3
+hg add bh3
+hg commit -d '5 0' -u test -m "Adding b branch head 3"
+hg heads
+echo '-------'
+hg heads -b
+
+echo '======='
+hg merge 4
+hg commit -d '6 0' -u test -m "Merging b branch head 2 and b branch head 3"
+hg heads
+echo '-------'
+hg heads -b
+
+echo '======='
+echo 'c' >c
+hg add c
+hg branch c
+hg commit -d '7 0' -u test -m "Adding c branch"
+hg heads
+echo '-------'
+hg heads -b
+
+echo '======='
+hg heads -b -r 3
+echo $?
+echo '-------'
+hg heads -b -r 2
+echo $?
+echo '-------'
+hg update -C 4
+echo $?
+echo '-------'
+hg heads -b -r 3
+echo $?
+echo '-------'
+hg heads -b -r 2
+echo $?
+echo '-------'
+hg branch joe
+hg heads -b
+echo $?
+hg heads -b -r 7
+echo $?
+
+echo '======='
+for i in 0 1 2 3 4 5 6 7; do
+    hg update -C "$i"
+    hg heads
+    echo '-------'
+    hg heads -b
+done
diff --git a/tests/test-bheads.out b/tests/test-bheads.out
new file mode 100644
--- /dev/null
+++ b/tests/test-bheads.out
@@ -0,0 +1,533 @@
+changeset:   0:19709c5a4e75
+tag:         tip
+user:        test
+date:        Thu Jan 01 00:00:00 1970 +0000
+summary:     Adding root node
+
+-------
+changeset:   0:19709c5a4e75
+tag:         tip
+user:        test
+date:        Thu Jan 01 00:00:00 1970 +0000
+summary:     Adding root node
+
+=======
+changeset:   1:dd6b440dd85a
+branch:      a
+tag:         tip
+user:        test
+date:        Thu Jan 01 00:00:01 1970 +0000
+summary:     Adding a branch
+
+-------
+changeset:   1:dd6b440dd85a
+branch:      a
+tag:         tip
+user:        test
+date:        Thu Jan 01 00:00:01 1970 +0000
+summary:     Adding a branch
+
+=======
+0 files updated, 0 files merged, 1 files removed, 0 files unresolved
+changeset:   2:ac22033332d1
+branch:      b
+tag:         tip
+parent:      0:19709c5a4e75
+user:        test
+date:        Thu Jan 01 00:00:02 1970 +0000
+summary:     Adding b branch
+
+changeset:   1:dd6b440dd85a
+branch:      a
+user:        test
+date:        Thu Jan 01 00:00:01 1970 +0000
+summary:     Adding a branch
+
+-------
+changeset:   2:ac22033332d1
+branch:      b
+tag:         tip
+parent:      0:19709c5a4e75
+user:        test
+date:        Thu Jan 01 00:00:02 1970 +0000
+summary:     Adding b branch
+
+=======
+changeset:   3:aee39cd168d0
+branch:      b
+tag:         tip
+user:        test
+date:        Thu Jan 01 00:00:03 1970 +0000
+summary:     Adding b branch head 1
+
+changeset:   1:dd6b440dd85a
+branch:      a
+user:        test
+date:        Thu Jan 01 00:00:01 1970 +0000
+summary:     Adding a branch
+
+-------
+changeset:   3:aee39cd168d0
+branch:      b
+tag:         tip
+user:        test
+date:        Thu Jan 01 00:00:03 1970 +0000
+summary:     Adding b branch head 1
+
+=======
+0 files updated, 0 files merged, 1 files removed, 0 files unresolved
+changeset:   4:22df7444f7c1
+branch:      b
+tag:         tip
+parent:      2:ac22033332d1
+user:        test
+date:        Thu Jan 01 00:00:04 1970 +0000
+summary:     Adding b branch head 2
+
+changeset:   3:aee39cd168d0
+branch:      b
+user:        test
+date:        Thu Jan 01 00:00:03 1970 +0000
+summary:     Adding b branch head 1
+
+changeset:   1:dd6b440dd85a
+branch:      a
+user:        test
+date:        Thu Jan 01 00:00:01 1970 +0000
+summary:     Adding a branch
+
+-------
+changeset:   4:22df7444f7c1
+branch:      b
+tag:         tip
+parent:      2:ac22033332d1
+user:        test
+date:        Thu Jan 01 00:00:04 1970 +0000
+summary:     Adding b branch head 2
+
+changeset:   3:aee39cd168d0
+branch:      b
+user:        test
+date:        Thu Jan 01 00:00:03 1970 +0000
+summary:     Adding b branch head 1
+
+=======
+0 files updated, 0 files merged, 1 files removed, 0 files unresolved
+changeset:   5:0d57af4f9583
+branch:      b
+tag:         tip
+parent:      2:ac22033332d1
+user:        test
+date:        Thu Jan 01 00:00:05 1970 +0000
+summary:     Adding b branch head 3
+
+changeset:   4:22df7444f7c1
+branch:      b
+parent:      2:ac22033332d1
+user:        test
+date:        Thu Jan 01 00:00:04 1970 +0000
+summary:     Adding b branch head 2
+
+changeset:   3:aee39cd168d0
+branch:      b
+user:        test
+date:        Thu Jan 01 00:00:03 1970 +0000
+summary:     Adding b branch head 1
+
+changeset:   1:dd6b440dd85a
+branch:      a
+user:        test
+date:        Thu Jan 01 00:00:01 1970 +0000
+summary:     Adding a branch
+
+-------
+changeset:   5:0d57af4f9583
+branch:      b
+tag:         tip
+parent:      2:ac22033332d1
+user:        test
+date:        Thu Jan 01 00:00:05 1970 +0000
+summary:     Adding b branch head 3
+
+changeset:   4:22df7444f7c1
+branch:      b
+parent:      2:ac22033332d1
+user:        test
+date:        Thu Jan 01 00:00:04 1970 +0000
+summary:     Adding b branch head 2
+
+changeset:   3:aee39cd168d0
+branch:      b
+user:        test
+date:        Thu Jan 01 00:00:03 1970 +0000
+summary:     Adding b branch head 1
+
+=======
+1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+(branch merge, don't forget to commit)
+changeset:   6:00432327d822
+branch:      b
+tag:         tip
+parent:      5:0d57af4f9583
+parent:      4:22df7444f7c1
+user:        test
+date:        Thu Jan 01 00:00:06 1970 +0000
+summary:     Merging b branch head 2 and b branch head 3
+
+changeset:   3:aee39cd168d0
+branch:      b
+user:        test
+date:        Thu Jan 01 00:00:03 1970 +0000
+summary:     Adding b branch head 1
+
+changeset:   1:dd6b440dd85a
+branch:      a
+user:        test
+date:        Thu Jan 01 00:00:01 1970 +0000
+summary:     Adding a branch
+
+-------
+changeset:   6:00432327d822
+branch:      b
+tag:         tip
+parent:      5:0d57af4f9583
+parent:      4:22df7444f7c1
+user:        test
+date:        Thu Jan 01 00:00:06 1970 +0000
+summary:     Merging b branch head 2 and b branch head 3
+
+changeset:   3:aee39cd168d0
+branch:      b
+user:        test
+date:        Thu Jan 01 00:00:03 1970 +0000
+summary:     Adding b branch head 1
+
+=======
+changeset:   7:9fb091bb9835
+branch:      c
+tag:         tip
+user:        test
+date:        Thu Jan 01 00:00:07 1970 +0000
+summary:     Adding c branch
+
+changeset:   3:aee39cd168d0
+branch:      b
+user:        test
+date:        Thu Jan 01 00:00:03 1970 +0000
+summary:     Adding b branch head 1
+
+changeset:   1:dd6b440dd85a
+branch:      a
+user:        test
+date:        Thu Jan 01 00:00:01 1970 +0000
+summary:     Adding a branch
+
+-------
+changeset:   7:9fb091bb9835
+branch:      c
+tag:         tip
+user:        test
+date:        Thu Jan 01 00:00:07 1970 +0000
+summary:     Adding c branch
+
+=======
+No changes on branch c are reachable from revision 3
+1
+-------
+changeset:   7:9fb091bb9835
+branch:      c
+tag:         tip
+user:        test
+date:        Thu Jan 01 00:00:07 1970 +0000
+summary:     Adding c branch
+
+0
+-------
+0 files updated, 0 files merged, 2 files removed, 0 files unresolved
+0
+-------
+changeset:   3:aee39cd168d0
+branch:      b
+user:        test
+date:        Thu Jan 01 00:00:03 1970 +0000
+summary:     Adding b branch head 1
+
+0
+-------
+changeset:   3:aee39cd168d0
+branch:      b
+user:        test
+date:        Thu Jan 01 00:00:03 1970 +0000
+summary:     Adding b branch head 1
+
+changeset:   6:00432327d822
+branch:      b
+parent:      5:0d57af4f9583
+parent:      4:22df7444f7c1
+user:        test
+date:        Thu Jan 01 00:00:06 1970 +0000
+summary:     Merging b branch head 2 and b branch head 3
+
+0
+-------
+joe is a new branch that has no heads yet.
+0
+joe is a new branch that has no heads yet.
+0
+=======
+0 files updated, 0 files merged, 2 files removed, 0 files unresolved
+changeset:   7:9fb091bb9835
+branch:      c
+tag:         tip
+user:        test
+date:        Thu Jan 01 00:00:07 1970 +0000
+summary:     Adding c branch
+
+changeset:   3:aee39cd168d0
+branch:      b
+user:        test
+date:        Thu Jan 01 00:00:03 1970 +0000
+summary:     Adding b branch head 1
+
+changeset:   1:dd6b440dd85a
+branch:      a
+user:        test
+date:        Thu Jan 01 00:00:01 1970 +0000
+summary:     Adding a branch
+
+-------
+changeset:   0:19709c5a4e75
+user:        test
+date:        Thu Jan 01 00:00:00 1970 +0000
+summary:     Adding root node
+
+1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+changeset:   7:9fb091bb9835
+branch:      c
+tag:         tip
+user:        test
+date:        Thu Jan 01 00:00:07 1970 +0000
+summary:     Adding c branch
+
+changeset:   3:aee39cd168d0
+branch:      b
+user:        test
+date:        Thu Jan 01 00:00:03 1970 +0000
+summary:     Adding b branch head 1
+
+changeset:   1:dd6b440dd85a
+branch:      a
+user:        test
+date:        Thu Jan 01 00:00:01 1970 +0000
+summary:     Adding a branch
+
+-------
+changeset:   1:dd6b440dd85a
+branch:      a
+user:        test
+date:        Thu Jan 01 00:00:01 1970 +0000
+summary:     Adding a branch
+
+1 files updated, 0 files merged, 1 files removed, 0 files unresolved
+changeset:   7:9fb091bb9835
+branch:      c
+tag:         tip
+user:        test
+date:        Thu Jan 01 00:00:07 1970 +0000
+summary:     Adding c branch
+
+changeset:   3:aee39cd168d0
+branch:      b
+user:        test
+date:        Thu Jan 01 00:00:03 1970 +0000
+summary:     Adding b branch head 1
+
+changeset:   1:dd6b440dd85a
+branch:      a
+user:        test
+date:        Thu Jan 01 00:00:01 1970 +0000
+summary:     Adding a branch
+
+-------
+changeset:   6:00432327d822
+branch:      b
+parent:      5:0d57af4f9583
+parent:      4:22df7444f7c1
+user:        test
+date:        Thu Jan 01 00:00:06 1970 +0000
+summary:     Merging b branch head 2 and b branch head 3
+
+changeset:   3:aee39cd168d0
+branch:      b
+user:        test
+date:        Thu Jan 01 00:00:03 1970 +0000
+summary:     Adding b branch head 1
+
+1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+changeset:   7:9fb091bb9835
+branch:      c
+tag:         tip
+user:        test
+date:        Thu Jan 01 00:00:07 1970 +0000
+summary:     Adding c branch
+
+changeset:   3:aee39cd168d0
+branch:      b
+user:        test
+date:        Thu Jan 01 00:00:03 1970 +0000
+summary:     Adding b branch head 1
+
+changeset:   1:dd6b440dd85a
+branch:      a
+user:        test
+date:        Thu Jan 01 00:00:01 1970 +0000
+summary:     Adding a branch
+
+-------
+changeset:   6:00432327d822
+branch:      b
+parent:      5:0d57af4f9583
+parent:      4:22df7444f7c1
+user:        test
+date:        Thu Jan 01 00:00:06 1970 +0000
+summary:     Merging b branch head 2 and b branch head 3
+
+changeset:   3:aee39cd168d0
+branch:      b
+user:        test
+date:        Thu Jan 01 00:00:03 1970 +0000
+summary:     Adding b branch head 1
+
+1 files updated, 0 files merged, 1 files removed, 0 files unresolved
+changeset:   7:9fb091bb9835
+branch:      c
+tag:         tip
+user:        test
+date:        Thu Jan 01 00:00:07 1970 +0000
+summary:     Adding c branch
+
+changeset:   3:aee39cd168d0
+branch:      b
+user:        test
+date:        Thu Jan 01 00:00:03 1970 +0000
+summary:     Adding b branch head 1
+
+changeset:   1:dd6b440dd85a
+branch:      a
+user:        test
+date:        Thu Jan 01 00:00:01 1970 +0000
+summary:     Adding a branch
+
+-------
+changeset:   6:00432327d822
+branch:      b
+parent:      5:0d57af4f9583
+parent:      4:22df7444f7c1
+user:        test
+date:        Thu Jan 01 00:00:06 1970 +0000
+summary:     Merging b branch head 2 and b branch head 3
+
+changeset:   3:aee39cd168d0
+branch:      b
+user:        test
+date:        Thu Jan 01 00:00:03 1970 +0000
+summary:     Adding b branch head 1
+
+1 files updated, 0 files merged, 1 files removed, 0 files unresolved
+changeset:   7:9fb091bb9835
+branch:      c
+tag:         tip
+user:        test
+date:        Thu Jan 01 00:00:07 1970 +0000
+summary:     Adding c branch
+
+changeset:   3:aee39cd168d0
+branch:      b
+user:        test
+date:        Thu Jan 01 00:00:03 1970 +0000
+summary:     Adding b branch head 1
+
+changeset:   1:dd6b440dd85a
+branch:      a
+user:        test
+date:        Thu Jan 01 00:00:01 1970 +0000
+summary:     Adding a branch
+
+-------
+changeset:   6:00432327d822
+branch:      b
+parent:      5:0d57af4f9583
+parent:      4:22df7444f7c1
+user:        test
+date:        Thu Jan 01 00:00:06 1970 +0000
+summary:     Merging b branch head 2 and b branch head 3
+
+changeset:   3:aee39cd168d0
+branch:      b
+user:        test
+date:        Thu Jan 01 00:00:03 1970 +0000
+summary:     Adding b branch head 1
+
+1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+changeset:   7:9fb091bb9835
+branch:      c
+tag:         tip
+user:        test
+date:        Thu Jan 01 00:00:07 1970 +0000
+summary:     Adding c branch
+
+changeset:   3:aee39cd168d0
+branch:      b
+user:        test
+date:        Thu Jan 01 00:00:03 1970 +0000
+summary:     Adding b branch head 1
+
+changeset:   1:dd6b440dd85a
+branch:      a
+user:        test
+date:        Thu Jan 01 00:00:01 1970 +0000
+summary:     Adding a branch
+
+-------
+changeset:   6:00432327d822
+branch:      b
+parent:      5:0d57af4f9583
+parent:      4:22df7444f7c1
+user:        test
+date:        Thu Jan 01 00:00:06 1970 +0000
+summary:     Merging b branch head 2 and b branch head 3
+
+changeset:   3:aee39cd168d0
+branch:      b
+user:        test
+date:        Thu Jan 01 00:00:03 1970 +0000
+summary:     Adding b branch head 1
+
+1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+changeset:   7:9fb091bb9835
+branch:      c
+tag:         tip
+user:        test
+date:        Thu Jan 01 00:00:07 1970 +0000
+summary:     Adding c branch
+
+changeset:   3:aee39cd168d0
+branch:      b
+user:        test
+date:        Thu Jan 01 00:00:03 1970 +0000
+summary:     Adding b branch head 1
+
+changeset:   1:dd6b440dd85a
+branch:      a
+user:        test
+date:        Thu Jan 01 00:00:01 1970 +0000
+summary:     Adding a branch
+
+-------
+changeset:   7:9fb091bb9835
+branch:      c
+tag:         tip
+user:        test
+date:        Thu Jan 01 00:00:07 1970 +0000
+summary:     Adding c branch
+

-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: not available
Url : http://selenic.com/pipermail/mercurial-devel/attachments/20070607/71cccf1f/attachment.pgp 


More information about the Mercurial-devel mailing list