Mercurial > hg

comparison tests/test-rebase-interruptions.t @ 23517:4f18e80d9c30

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
rebase: show more useful status information while rebasing Show status messages while rebasing, similar to what graft do: rebasing 12:2647734878ef "fork" (tip) This gives more context for the user when resolving conflicts.
author Mads Kiilerich <madski@unity3d.com>
date Tue, 09 Dec 2014 03:45:26 +0100
parents b081decd9062
children d298805fb639
comparison
equal deleted inserted replaced
23516:328afbad6e57 23517:4f18e80d9c30
55 o 0: 'A' 55 o 0: 'A'
56 56
57 Rebasing B onto E: 57 Rebasing B onto E:
58 58
59 $ hg rebase -s 1 -d 4 59 $ hg rebase -s 1 -d 4
60 rebasing 1:27547f69f254 "B"
61 rebasing 2:965c486023db "C"
60 merging A 62 merging A
61 warning: conflicts during merge. 63 warning: conflicts during merge.
62 merging A incomplete! (edit conflicts, then use 'hg resolve --mark') 64 merging A incomplete! (edit conflicts, then use 'hg resolve --mark')
63 unresolved conflicts (see hg resolve, then hg rebase --continue) 65 unresolved conflicts (see hg resolve, then hg rebase --continue)
64 [1] 66 [1]
91 o 0:draft 'A' 93 o 0:draft 'A'
92 94
93 Resume the rebasing: 95 Resume the rebasing:
94 96
95 $ hg rebase --continue 97 $ hg rebase --continue
98 already rebased 1:27547f69f254 "B" as 45396c49d53b
99 rebasing 2:965c486023db "C"
96 merging A 100 merging A
97 warning: conflicts during merge. 101 warning: conflicts during merge.
98 merging A incomplete! (edit conflicts, then use 'hg resolve --mark') 102 merging A incomplete! (edit conflicts, then use 'hg resolve --mark')
99 unresolved conflicts (see hg resolve, then hg rebase --continue) 103 unresolved conflicts (see hg resolve, then hg rebase --continue)
100 [1] 104 [1]
105 $ rm A.orig 109 $ rm A.orig
106 $ hg resolve -m A 110 $ hg resolve -m A
107 (no more unresolved files) 111 (no more unresolved files)
108 112
109 $ hg rebase --continue 113 $ hg rebase --continue
114 already rebased 1:27547f69f254 "B" as 45396c49d53b
115 rebasing 2:965c486023db "C"
110 warning: new changesets detected on source branch, not stripping 116 warning: new changesets detected on source branch, not stripping
111 117
112 $ hg tglogp 118 $ hg tglogp
113 o 7:draft 'C' 119 o 7:draft 'C'
114 | 120 |
146 o 0: 'A' 152 o 0: 'A'
147 153
148 Rebasing B onto E: 154 Rebasing B onto E:
149 155
150 $ hg rebase -s 1 -d 4 156 $ hg rebase -s 1 -d 4
157 rebasing 1:27547f69f254 "B"
158 rebasing 2:965c486023db "C"
151 merging A 159 merging A
152 warning: conflicts during merge. 160 warning: conflicts during merge.
153 merging A incomplete! (edit conflicts, then use 'hg resolve --mark') 161 merging A incomplete! (edit conflicts, then use 'hg resolve --mark')
154 unresolved conflicts (see hg resolve, then hg rebase --continue) 162 unresolved conflicts (see hg resolve, then hg rebase --continue)
155 [1] 163 [1]
217 o 0:draft 'A' 225 o 0:draft 'A'
218 226
219 Rebasing B onto E: 227 Rebasing B onto E:
220 228
221 $ hg rebase -s 1 -d 4 229 $ hg rebase -s 1 -d 4
230 rebasing 1:27547f69f254 "B"
231 rebasing 2:965c486023db "C"
222 merging A 232 merging A
223 warning: conflicts during merge. 233 warning: conflicts during merge.
224 merging A incomplete! (edit conflicts, then use 'hg resolve --mark') 234 merging A incomplete! (edit conflicts, then use 'hg resolve --mark')
225 unresolved conflicts (see hg resolve, then hg rebase --continue) 235 unresolved conflicts (see hg resolve, then hg rebase --continue)
226 [1] 236 [1]