Mercurial > hg

comparison tests/test-rebase-emptycommit.t @ 34290:4f969b9e0cf5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
rebase: also include other namespaces in changeset description This makes use of the generic method of listing bookmarks and tags, so other extensions that add other namespaces will get their names added too. This does mean that bookmarks will come before tags, just like we apparently decided to order them in the "hg log" output. It doesn't seem like people would be parsing the rebase output anyway. We also did 79ab5369d55a (rebase: use _ctxdesc in one more place, 2017-08-29) recently, so now seems like a good time. Differential Revision: https://phab.mercurial-scm.org/D741
author Martin von Zweigbergk <martinvonz@google.com>
date Tue, 19 Sep 2017 22:06:26 -0700
parents 52f82e7d6a7e
children f61f5af5ed31
comparison
equal deleted inserted replaced
34289:1d6558f5ea74 34290:4f969b9e0cf5
75 an ancestor of bookmark B, after moving B to B-NEW, the changes are ideally 75 an ancestor of bookmark B, after moving B to B-NEW, the changes are ideally
76 still introduced by an ancestor of changeset on B-NEW. In the below case, 76 still introduced by an ancestor of changeset on B-NEW. In the below case,
77 "BOOK-D", and "BOOK-E" include changes introduced by "C". 77 "BOOK-D", and "BOOK-E" include changes introduced by "C".
78 78
79 $ hg rebase -s 2 -d E 79 $ hg rebase -s 2 -d E
80 rebasing 2:dc0947a82db8 "C" (C BOOK-C) 80 rebasing 2:dc0947a82db8 "C" (BOOK-C C)
81 rebasing 3:e7b3f00ed42e "D" (BOOK-D) 81 rebasing 3:e7b3f00ed42e "D" (BOOK-D)
82 note: rebase of 3:e7b3f00ed42e created no changes to commit 82 note: rebase of 3:e7b3f00ed42e created no changes to commit
83 rebasing 4:69a34c08022a "E" (BOOK-E) 83 rebasing 4:69a34c08022a "E" (BOOK-E)
84 note: rebase of 4:69a34c08022a created no changes to commit 84 note: rebase of 4:69a34c08022a created no changes to commit
85 rebasing 5:6b2aeab91270 "F" (F BOOK-F) 85 rebasing 5:6b2aeab91270 "F" (BOOK-F F)
86 saved backup bundle to $TESTTMP/non-merge/.hg/strip-backup/dc0947a82db8-52bb4973-rebase.hg (glob) 86 saved backup bundle to $TESTTMP/non-merge/.hg/strip-backup/dc0947a82db8-52bb4973-rebase.hg (glob)
87 $ hg log -G -T '{rev} {desc} {bookmarks}' 87 $ hg log -G -T '{rev} {desc} {bookmarks}'
88 o 5 F BOOK-F 88 o 5 F BOOK-F
89 | 89 |
90 o 4 C BOOK-C BOOK-D BOOK-E 90 o 4 C BOOK-C BOOK-D BOOK-E
127 $ hg rebase -r '(A::)-(B::)-A' -d H 127 $ hg rebase -r '(A::)-(B::)-A' -d H
128 rebasing 2:dc0947a82db8 "C" (BOOK-C) 128 rebasing 2:dc0947a82db8 "C" (BOOK-C)
129 note: rebase of 2:dc0947a82db8 created no changes to commit 129 note: rebase of 2:dc0947a82db8 created no changes to commit
130 rebasing 3:b18e25de2cf5 "D" (BOOK-D) 130 rebasing 3:b18e25de2cf5 "D" (BOOK-D)
131 note: rebase of 3:b18e25de2cf5 created no changes to commit 131 note: rebase of 3:b18e25de2cf5 created no changes to commit
132 rebasing 4:86a1f6686812 "E" (E BOOK-E) 132 rebasing 4:86a1f6686812 "E" (BOOK-E E)
133 note: rebase of 4:86a1f6686812 created no changes to commit 133 note: rebase of 4:86a1f6686812 created no changes to commit
134 saved backup bundle to $TESTTMP/merge1/.hg/strip-backup/b18e25de2cf5-1fd0a4ba-rebase.hg (glob) 134 saved backup bundle to $TESTTMP/merge1/.hg/strip-backup/b18e25de2cf5-1fd0a4ba-rebase.hg (glob)
135 135
136 $ hg log -G -T '{rev} {desc} {bookmarks}' 136 $ hg log -G -T '{rev} {desc} {bookmarks}'
137 o 4 H BOOK-C BOOK-D BOOK-E 137 o 4 H BOOK-C BOOK-D BOOK-E
174 > EOS 174 > EOS
175 175
176 $ hg rebase -r '(A::)-(B::)-A' -d H 176 $ hg rebase -r '(A::)-(B::)-A' -d H
177 rebasing 2:dc0947a82db8 "C" (BOOK-C) 177 rebasing 2:dc0947a82db8 "C" (BOOK-C)
178 note: rebase of 2:dc0947a82db8 created no changes to commit 178 note: rebase of 2:dc0947a82db8 created no changes to commit
179 rebasing 3:b18e25de2cf5 "D" (D BOOK-D) 179 rebasing 3:b18e25de2cf5 "D" (BOOK-D D)
180 rebasing 4:03ca77807e91 "E" (E BOOK-E) 180 rebasing 4:03ca77807e91 "E" (BOOK-E E)
181 rebasing 5:ad6717a6a58e "F" (BOOK-F) 181 rebasing 5:ad6717a6a58e "F" (BOOK-F)
182 note: rebase of 5:ad6717a6a58e created no changes to commit 182 note: rebase of 5:ad6717a6a58e created no changes to commit
183 rebasing 6:c58e8bdac1f4 "G" (G BOOK-G) 183 rebasing 6:c58e8bdac1f4 "G" (BOOK-G G)
184 saved backup bundle to $TESTTMP/merge2/.hg/strip-backup/b18e25de2cf5-2d487005-rebase.hg (glob) 184 saved backup bundle to $TESTTMP/merge2/.hg/strip-backup/b18e25de2cf5-2d487005-rebase.hg (glob)
185 185
186 $ hg log -G -T '{rev} {desc} {bookmarks}' 186 $ hg log -G -T '{rev} {desc} {bookmarks}'
187 o 7 G BOOK-G 187 o 7 G BOOK-G
188 |\ 188 |\