Mercurial > hg
comparison tests/test-bheads.out @ 10346:e2db50cae6e6
commands: don't do too much work for error messages
author | Dirkjan Ochtman <dirkjan@ochtman.nl> |
---|---|
date | Sat, 06 Feb 2010 19:33:28 +0100 |
parents | ec5240a22f4a |
children | fd511e9eeea6 |
comparison
equal
deleted
inserted
replaced
10345:bc2866bdf3e0 | 10346:e2db50cae6e6 |
---|---|
54 3: Adding b branch head 1 | 54 3: Adding b branch head 1 |
55 1: Adding a branch | 55 1: Adding a branch |
56 ------- | 56 ------- |
57 7: Adding c branch | 57 7: Adding c branch |
58 ======= | 58 ======= |
59 no changes on branch c are reachable from 3 | 59 no open branch heads found on branches c (started at 3) |
60 1 | 60 1 |
61 ------- | 61 ------- |
62 7: Adding c branch | 62 7: Adding c branch |
63 0 | 63 0 |
64 ------- | 64 ------- |
70 ------- | 70 ------- |
71 6: Merging b branch head 2 and b branch head 3 | 71 6: Merging b branch head 2 and b branch head 3 |
72 3: Adding b branch head 1 | 72 3: Adding b branch head 1 |
73 0 | 73 0 |
74 ------- | 74 ------- |
75 no changes on branch b are reachable from 7 | 75 no open branch heads found on branches b (started at 7) |
76 1 | 76 1 |
77 ======= | 77 ======= |
78 0 files updated, 0 files merged, 2 files removed, 0 files unresolved | 78 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
79 7: Adding c branch | 79 7: Adding c branch |
80 3: Adding b branch head 1 | 80 3: Adding b branch head 1 |