Mercurial > hg

comparison tests/test-rebase-scenario-global.t @ 40864:09680349cc2d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
rebase: format commit in usual way when explaining that it became empty We use the _ctxdesc() for other similar messages, so it seems we should use it here too. Differential Revision: https://phab.mercurial-scm.org/D5394
author Martin von Zweigbergk <martinvonz@google.com>
date Fri, 07 Dec 2018 14:17:09 -0800
parents 89630d0b3e23
children 4edd427f34c1
comparison
equal deleted inserted replaced
40863:443eb4bc41af 40864:09680349cc2d
136 E 136 E
137 137
138 $ hg rebase -s 4 -d 7 138 $ hg rebase -s 4 -d 7
139 rebasing 4:9520eea781bc "E" 139 rebasing 4:9520eea781bc "E"
140 rebasing 6:eea13746799a "G" 140 rebasing 6:eea13746799a "G"
141 note: rebase of 6:eea13746799a created no changes to commit 141 note: rebase of 6:eea13746799a "G" created no changes to commit
142 saved backup bundle to $TESTTMP/a3/.hg/strip-backup/9520eea781bc-fcd8edd4-rebase.hg 142 saved backup bundle to $TESTTMP/a3/.hg/strip-backup/9520eea781bc-fcd8edd4-rebase.hg
143 $ f E.orig 143 $ f E.orig
144 E.orig: file not found 144 E.orig: file not found
145 145
146 $ hg tglog 146 $ hg tglog
167 $ cd a4 167 $ cd a4
168 168
169 $ hg rebase -s 5 -d 4 169 $ hg rebase -s 5 -d 4
170 rebasing 5:24b6387c8c8c "F" 170 rebasing 5:24b6387c8c8c "F"
171 rebasing 6:eea13746799a "G" 171 rebasing 6:eea13746799a "G"
172 note: rebase of 6:eea13746799a created no changes to commit 172 note: rebase of 6:eea13746799a "G" created no changes to commit
173 rebasing 7:02de42196ebe "H" (tip) 173 rebasing 7:02de42196ebe "H" (tip)
174 saved backup bundle to $TESTTMP/a4/.hg/strip-backup/24b6387c8c8c-c3fe765d-rebase.hg 174 saved backup bundle to $TESTTMP/a4/.hg/strip-backup/24b6387c8c8c-c3fe765d-rebase.hg
175 175
176 $ hg tglog 176 $ hg tglog
177 @ 6: e9240aeaa6ad 'H' 177 @ 6: e9240aeaa6ad 'H'