Mercurial > hg
comparison tests/test-rebase-abort.t @ 45796:e9555305c5c6
templates: include all non-branch namespaces in default one-line summary
I left out branches and custom namespaces on purpose from D9252
because I figured that people like us (Google) who have custom
namespaces can also have custom configs. However, I just realized that
this makes everyone with the topic extension lose the topic they've
had in rebase output for a long time (ever since someone was nice
enough to add it in D741). Sorry about the churn.
The more generic template couldn't easily keep the "log.bookmark"
label in the template because the namespace is called "bookmarks"
(plural). That means that we can't be compatible with users' existing
configs for "log.bookmark", so I decided to change the labels to be in
a brand-new "oneline-summary" namespace.
Differential Revision: https://phab.mercurial-scm.org/D9262
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Thu, 29 Oct 2020 09:03:08 -0700 |
| parents | f90a5c211251 |
| children | 21733e8c924f |
comparison
equal
deleted
inserted
replaced
| 45795:c4ab93849383 | 45796:e9555305c5c6 |
|---|---|
| 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 tip foo "C" | 277 rebasing 3:6c0f977a22d8 foo tip "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 tip foo "b2" | 317 rebasing 2:070cf4580bb5 foo tip "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 |