Mercurial > hg
comparison tests/test-annotate.out @ 6336:4b0c9c674707
warn about new heads on commit (issue842)
author | Dirkjan Ochtman <dirkjan@ochtman.nl> |
---|---|
date | Fri, 21 Mar 2008 11:06:02 +0100 |
parents | 2192001e4bb4 |
children | 98a0421b9e52 |
comparison
equal
deleted
inserted
replaced
6335:e29557d687c9 | 6336:4b0c9c674707 |
---|---|
44 1 a:3: a | 44 1 a:3: a |
45 3 b:4: b4 | 45 3 b:4: b4 |
46 3 b:5: b5 | 46 3 b:5: b5 |
47 3 b:6: b6 | 47 3 b:6: b6 |
48 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | 48 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
49 created new head | |
49 merging b | 50 merging b |
50 0 files updated, 1 files merged, 0 files removed, 0 files unresolved | 51 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
51 (branch merge, don't forget to commit) | 52 (branch merge, don't forget to commit) |
52 % annotate after merge | 53 % annotate after merge |
53 0 a: a | 54 0 a: a |
62 1 a:3: a | 63 1 a:3: a |
63 3 b:4: b4 | 64 3 b:4: b4 |
64 4 b:5: c | 65 4 b:5: c |
65 3 b:5: b5 | 66 3 b:5: b5 |
66 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | 67 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
68 created new head | |
67 merging b | 69 merging b |
68 0 files updated, 1 files merged, 0 files removed, 0 files unresolved | 70 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
69 (branch merge, don't forget to commit) | 71 (branch merge, don't forget to commit) |
70 % annotate after rename merge | 72 % annotate after rename merge |
71 0 a: a | 73 0 a: a |