Mercurial > hg

comparison tests/test-rebase-bookmarks.t @ 45796:e9555305c5c6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
95 $ cd a4 95 $ cd a4
96 $ hg up -q 2 96 $ hg up -q 2
97 $ hg book W@diverge 97 $ hg book W@diverge
98 98
99 $ hg rebase -s W -d . 99 $ hg rebase -s W -d .
100 rebasing 3:41acb9dca9eb tip W "D" 100 rebasing 3:41acb9dca9eb W tip "D"
101 saved backup bundle to $TESTTMP/a4/.hg/strip-backup/41acb9dca9eb-b35a6a63-rebase.hg 101 saved backup bundle to $TESTTMP/a4/.hg/strip-backup/41acb9dca9eb-b35a6a63-rebase.hg
102 102
103 $ hg bookmarks 103 $ hg bookmarks
104 W 3:0d3554f74897 104 W 3:0d3554f74897
105 X 1:6c81ed0049f8 105 X 1:6c81ed0049f8
207 $ hg book bisect 207 $ hg book bisect
208 $ hg update -q Y 208 $ hg update -q Y
209 $ hg rebase -r '"bisect"^^::"bisect"^' -r bisect -d Z 209 $ hg rebase -r '"bisect"^^::"bisect"^' -r bisect -d Z
210 rebasing 5:345c90f326a4 "bisect" 210 rebasing 5:345c90f326a4 "bisect"
211 rebasing 6:f677a2907404 "bisect2" 211 rebasing 6:f677a2907404 "bisect2"
212 rebasing 7:325c16001345 tip bisect "bisect3" 212 rebasing 7:325c16001345 bisect tip "bisect3"
213 saved backup bundle to $TESTTMP/a3/.hg/strip-backup/345c90f326a4-b4840586-rebase.hg 213 saved backup bundle to $TESTTMP/a3/.hg/strip-backup/345c90f326a4-b4840586-rebase.hg
214 214
215 Bookmark and working parent get moved even if --keep is set (issue5682) 215 Bookmark and working parent get moved even if --keep is set (issue5682)
216 216
217 $ hg init $TESTTMP/book-keep 217 $ hg init $TESTTMP/book-keep