Mercurial > hg
comparison tests/test-rebase-abort.t @ 45771:f90a5c211251
rebase: change and standarize template for rebase's one-line summary
This removes the default template in rebase and switches to a
centrally defined template. I've simplified it a bit to avoid the
conditional parenthesis. I've also added labels so the different parts
can be easily colored. The template is somewhat similar to what we've
used internally at Google for a few years.
I'm happy to change the template if others have opinions. Should we
reuse the `color.log.` names as I have?
Differential Revision: https://phab.mercurial-scm.org/D9252
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Tue, 27 Oct 2020 15:33:15 -0700 |
parents | a253ded5b03d |
children | e9555305c5c6 |
comparison
equal
deleted
inserted
replaced
45770:96fcc37a9c80 | 45771:f90a5c211251 |
---|---|
76 | 76 |
77 Conflicting rebase: | 77 Conflicting rebase: |
78 | 78 |
79 $ hg rebase -s 3 -d 2 | 79 $ hg rebase -s 3 -d 2 |
80 rebasing 3:3163e20567cc "L1" | 80 rebasing 3:3163e20567cc "L1" |
81 rebasing 4:46f0b057b5c0 "L2" (tip) | 81 rebasing 4:46f0b057b5c0 tip "L2" |
82 merging common | 82 merging common |
83 warning: conflicts while merging common! (edit, then use 'hg resolve --mark') | 83 warning: conflicts while merging common! (edit, then use 'hg resolve --mark') |
84 unresolved conflicts (see 'hg resolve', then 'hg rebase --continue') | 84 unresolved conflicts (see 'hg resolve', then 'hg rebase --continue') |
85 [1] | 85 [1] |
86 | 86 |
143 forgotten) by Mercurial earlier than 2.7. This emulates Mercurial | 143 forgotten) by Mercurial earlier than 2.7. This emulates Mercurial |
144 earlier than 2.7 by renaming ".hg/rebasestate" temporarily. | 144 earlier than 2.7 by renaming ".hg/rebasestate" temporarily. |
145 | 145 |
146 $ hg rebase -s 3 -d 2 | 146 $ hg rebase -s 3 -d 2 |
147 rebasing 3:3163e20567cc "L1" | 147 rebasing 3:3163e20567cc "L1" |
148 rebasing 4:46f0b057b5c0 "L2" (tip) | 148 rebasing 4:46f0b057b5c0 tip "L2" |
149 merging common | 149 merging common |
150 warning: conflicts while merging common! (edit, then use 'hg resolve --mark') | 150 warning: conflicts while merging common! (edit, then use 'hg resolve --mark') |
151 unresolved conflicts (see 'hg resolve', then 'hg rebase --continue') | 151 unresolved conflicts (see 'hg resolve', then 'hg rebase --continue') |
152 [1] | 152 [1] |
153 | 153 |
213 o 0:public 'A' | 213 o 0:public 'A' |
214 | 214 |
215 $ hg rebase -b 4 -d 2 | 215 $ hg rebase -b 4 -d 2 |
216 rebasing 3:a6484957d6b9 "B bis" | 216 rebasing 3:a6484957d6b9 "B bis" |
217 note: not rebasing 3:a6484957d6b9 "B bis", its destination already has all its changes | 217 note: not rebasing 3:a6484957d6b9 "B bis", its destination already has all its changes |
218 rebasing 4:145842775fec "C1" (tip) | 218 rebasing 4:145842775fec tip "C1" |
219 merging c | 219 merging c |
220 warning: conflicts while merging c! (edit, then use 'hg resolve --mark') | 220 warning: conflicts while merging c! (edit, then use 'hg resolve --mark') |
221 unresolved conflicts (see 'hg resolve', then 'hg rebase --continue') | 221 unresolved conflicts (see 'hg resolve', then 'hg rebase --continue') |
222 [1] | 222 [1] |
223 | 223 |
272 |/ | 272 |/ |
273 o 0 a | 273 o 0 a |
274 | 274 |
275 | 275 |
276 $ hg rebase -d master -r foo | 276 $ hg rebase -d master -r foo |
277 rebasing 3:6c0f977a22d8 "C" (foo tip) | 277 rebasing 3:6c0f977a22d8 tip foo "C" |
278 merging c | 278 merging c |
279 warning: conflicts while merging c! (edit, then use 'hg resolve --mark') | 279 warning: conflicts while merging c! (edit, then use 'hg resolve --mark') |
280 unresolved conflicts (see 'hg resolve', then 'hg rebase --continue') | 280 unresolved conflicts (see 'hg resolve', then 'hg rebase --continue') |
281 [1] | 281 [1] |
282 $ hg abort | 282 $ hg abort |
312 $ hg add b | 312 $ hg add b |
313 $ hg commit -m b2 | 313 $ hg commit -m b2 |
314 created new head | 314 created new head |
315 | 315 |
316 $ hg rebase -d @ -b foo --tool=internal:fail | 316 $ hg rebase -d @ -b foo --tool=internal:fail |
317 rebasing 2:070cf4580bb5 "b2" (foo tip) | 317 rebasing 2:070cf4580bb5 tip foo "b2" |
318 unresolved conflicts (see 'hg resolve', then 'hg rebase --continue') | 318 unresolved conflicts (see 'hg resolve', then 'hg rebase --continue') |
319 [1] | 319 [1] |
320 | 320 |
321 $ mv .hg/rebasestate ./ # so we're allowed to hg up like in mercurial <2.6.3 | 321 $ mv .hg/rebasestate ./ # so we're allowed to hg up like in mercurial <2.6.3 |
322 $ hg up -C 0 # user does other stuff in the repo | 322 $ hg up -C 0 # user does other stuff in the repo |