Mercurial > hg
diff tests/test-bheads.out @ 10350:fd511e9eeea6
commands: do all branch heads by default, demote topological to -t/--topo
| author | Dirkjan Ochtman <dirkjan@ochtman.nl> |
|---|---|
| date | Sat, 06 Feb 2010 19:38:39 +0100 |
| parents | e2db50cae6e6 |
| children | 5b48d819d5f9 |
line wrap: on
line diff
--- a/tests/test-bheads.out Sat Feb 06 19:33:40 2010 +0100 +++ b/tests/test-bheads.out Sat Feb 06 19:38:39 2010 +0100 @@ -1,154 +1,182 @@ -0: Adding root node +0: Adding root node () ------- -0: Adding root node +0: Adding root node () ======= marked working directory as branch a -1: Adding a branch +1: Adding a branch (a) +0: Adding root node () ------- -1: Adding a branch +1: Adding a branch (a) ======= 0 files updated, 0 files merged, 1 files removed, 0 files unresolved marked working directory as branch b created new head -2: Adding b branch -1: Adding a branch +2: Adding b branch (b) +1: Adding a branch (a) +0: Adding root node () ------- -2: Adding b branch +2: Adding b branch (b) ======= -3: Adding b branch head 1 -1: Adding a branch +3: Adding b branch head 1 (b) +1: Adding a branch (a) +0: Adding root node () ------- -3: Adding b branch head 1 +3: Adding b branch head 1 (b) ======= 0 files updated, 0 files merged, 1 files removed, 0 files unresolved created new head -4: Adding b branch head 2 -3: Adding b branch head 1 -1: Adding a branch +4: Adding b branch head 2 (b) +3: Adding b branch head 1 (b) +1: Adding a branch (a) +0: Adding root node () ------- -4: Adding b branch head 2 -3: Adding b branch head 1 +4: Adding b branch head 2 (b) +3: Adding b branch head 1 (b) ======= 0 files updated, 0 files merged, 1 files removed, 0 files unresolved created new head -5: Adding b branch head 3 -4: Adding b branch head 2 -3: Adding b branch head 1 -1: Adding a branch +5: Adding b branch head 3 (b) +4: Adding b branch head 2 (b) +3: Adding b branch head 1 (b) +1: Adding a branch (a) +0: Adding root node () ------- -5: Adding b branch head 3 -4: Adding b branch head 2 -3: Adding b branch head 1 +5: Adding b branch head 3 (b) +4: Adding b branch head 2 (b) +3: Adding b branch head 1 (b) ======= 1 files updated, 0 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit) -6: Merging b branch head 2 and b branch head 3 -3: Adding b branch head 1 -1: Adding a branch +6: Merging b branch head 2 and b branch head 3 (b) +3: Adding b branch head 1 (b) +1: Adding a branch (a) +0: Adding root node () ------- -6: Merging b branch head 2 and b branch head 3 -3: Adding b branch head 1 +6: Merging b branch head 2 and b branch head 3 (b) +3: Adding b branch head 1 (b) ======= marked working directory as branch c -7: Adding c branch -3: Adding b branch head 1 -1: Adding a branch +7: Adding c branch (c) +6: Merging b branch head 2 and b branch head 3 (b) +3: Adding b branch head 1 (b) +1: Adding a branch (a) +0: Adding root node () ------- -7: Adding c branch +7: Adding c branch (c) ======= no open branch heads found on branches c (started at 3) 1 ------- -7: Adding c branch +7: Adding c branch (c) 0 ------- 0 files updated, 0 files merged, 2 files removed, 0 files unresolved 0 ------- -3: Adding b branch head 1 +3: Adding b branch head 1 (b) 0 ------- -6: Merging b branch head 2 and b branch head 3 -3: Adding b branch head 1 +6: Merging b branch head 2 and b branch head 3 (b) +3: Adding b branch head 1 (b) 0 ------- no open branch heads found on branches b (started at 7) 1 ======= 0 files updated, 0 files merged, 2 files removed, 0 files unresolved -7: Adding c branch -3: Adding b branch head 1 -1: Adding a branch +7: Adding c branch (c) +6: Merging b branch head 2 and b branch head 3 (b) +3: Adding b branch head 1 (b) +1: Adding a branch (a) +0: Adding root node () ------- -0: Adding root node +0: Adding root node () ------- 1 files updated, 0 files merged, 0 files removed, 0 files unresolved -7: Adding c branch -3: Adding b branch head 1 -1: Adding a branch +7: Adding c branch (c) +6: Merging b branch head 2 and b branch head 3 (b) +3: Adding b branch head 1 (b) +1: Adding a branch (a) +0: Adding root node () ------- -1: Adding a branch +1: Adding a branch (a) ------- 1 files updated, 0 files merged, 1 files removed, 0 files unresolved -7: Adding c branch -3: Adding b branch head 1 -1: Adding a branch +7: Adding c branch (c) +6: Merging b branch head 2 and b branch head 3 (b) +3: Adding b branch head 1 (b) +1: Adding a branch (a) +0: Adding root node () ------- -6: Merging b branch head 2 and b branch head 3 -3: Adding b branch head 1 +6: Merging b branch head 2 and b branch head 3 (b) +3: Adding b branch head 1 (b) ------- 1 files updated, 0 files merged, 0 files removed, 0 files unresolved -7: Adding c branch -3: Adding b branch head 1 -1: Adding a branch +7: Adding c branch (c) +6: Merging b branch head 2 and b branch head 3 (b) +3: Adding b branch head 1 (b) +1: Adding a branch (a) +0: Adding root node () ------- -6: Merging b branch head 2 and b branch head 3 -3: Adding b branch head 1 +6: Merging b branch head 2 and b branch head 3 (b) +3: Adding b branch head 1 (b) ------- 1 files updated, 0 files merged, 1 files removed, 0 files unresolved -7: Adding c branch -3: Adding b branch head 1 -1: Adding a branch +7: Adding c branch (c) +6: Merging b branch head 2 and b branch head 3 (b) +3: Adding b branch head 1 (b) +1: Adding a branch (a) +0: Adding root node () ------- -6: Merging b branch head 2 and b branch head 3 -3: Adding b branch head 1 +6: Merging b branch head 2 and b branch head 3 (b) +3: Adding b branch head 1 (b) ------- 1 files updated, 0 files merged, 1 files removed, 0 files unresolved -7: Adding c branch -3: Adding b branch head 1 -1: Adding a branch +7: Adding c branch (c) +6: Merging b branch head 2 and b branch head 3 (b) +3: Adding b branch head 1 (b) +1: Adding a branch (a) +0: Adding root node () ------- -6: Merging b branch head 2 and b branch head 3 -3: Adding b branch head 1 +6: Merging b branch head 2 and b branch head 3 (b) +3: Adding b branch head 1 (b) ------- 1 files updated, 0 files merged, 0 files removed, 0 files unresolved -7: Adding c branch -3: Adding b branch head 1 -1: Adding a branch +7: Adding c branch (c) +6: Merging b branch head 2 and b branch head 3 (b) +3: Adding b branch head 1 (b) +1: Adding a branch (a) +0: Adding root node () ------- -6: Merging b branch head 2 and b branch head 3 -3: Adding b branch head 1 +6: Merging b branch head 2 and b branch head 3 (b) +3: Adding b branch head 1 (b) ------- 1 files updated, 0 files merged, 0 files removed, 0 files unresolved -7: Adding c branch -3: Adding b branch head 1 -1: Adding a branch +7: Adding c branch (c) +6: Merging b branch head 2 and b branch head 3 (b) +3: Adding b branch head 1 (b) +1: Adding a branch (a) +0: Adding root node () ------- -7: Adding c branch +7: Adding c branch (c) ------- ======= -1: Adding a branch +1: Adding a branch (a) ------- -6: Merging b branch head 2 and b branch head 3 -3: Adding b branch head 1 +6: Merging b branch head 2 and b branch head 3 (b) +3: Adding b branch head 1 (b) ------- -7: Adding c branch +7: Adding c branch (c) ------- abort: unknown revision 'z'! ------- ======= -7: Adding c branch -6: Merging b branch head 2 and b branch head 3 -3: Adding b branch head 1 -1: Adding a branch -0: Adding root node +7: Adding c branch (c) +6: Merging b branch head 2 and b branch head 3 (b) +3: Adding b branch head 1 (b) +1: Adding a branch (a) +0: Adding root node () +% topological heads +7: Adding c branch (c) +3: Adding b branch head 1 (b) +1: Adding a branch (a)