Mercurial > hg

comparison tests/test-rebase-interruptions.out @ 11198:b345b1cc124f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
rebase: use helpers.sh in tests
author Matt Mackall <mpm@selenic.com>
date Wed, 19 May 2010 20:20:12 -0500
parents 808f03f61ebe
children 7a9cf012dddc
comparison
equal deleted inserted replaced
11197:4bb4895e1693 11198:b345b1cc124f
9 |/ 9 |/
10 o 0: A 10 o 0: A
11 11
12 12
13 % - Rebasing B onto E 13 % - Rebasing B onto E
14 merging A
15 warning: conflicts during merge. 14 warning: conflicts during merge.
16 merging A failed! 15 merging A failed!
17 abort: fix unresolved conflicts with hg resolve then run hg rebase --continue 16 abort: fix unresolved conflicts with hg resolve then run hg rebase --continue
17 merging A
18 18
19 % - Force a commit on C during the interruption 19 % - Force a commit on C during the interruption
20 1 files updated, 0 files merged, 1 files removed, 0 files unresolved 20 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
21 @ 6: Extra 21 @ 6: Extra
22 | 22 |
71 |/ 71 |/
72 o 0: A 72 o 0: A
73 73
74 74
75 % Rebasing B onto E 75 % Rebasing B onto E
76 merging A
77 warning: conflicts during merge. 76 warning: conflicts during merge.
78 merging A failed! 77 merging A failed!
79 abort: fix unresolved conflicts with hg resolve then run hg rebase --continue 78 abort: fix unresolved conflicts with hg resolve then run hg rebase --continue
79 merging A
80 80
81 % Force a commit on B' during the interruption 81 % Force a commit on B' during the interruption
82 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 82 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
83 @ 6: Extra 83 @ 6: Extra
84 | 84 |