Mercurial > hg

comparison tests/test-rebase-mq-skip.t @ 40865:4edd427f34c1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
rebase: clarify that commits that become empty are skipped Our message just said that it created no changes, but we didn't explicitly say that that meant that the the commit was not rebased. It also wasn't clear why it created no changes, so this patch also clarifies that that was because the changes were already in the destination. Differential Revision: https://phab.mercurial-scm.org/D5395
author Martin von Zweigbergk <martinvonz@google.com>
date Fri, 07 Dec 2018 14:23:17 -0800
parents 09680349cc2d
children 35ebdbb38efb
comparison
equal deleted inserted replaced
40864:09680349cc2d 40865:4edd427f34c1
60 p0 60 p0
61 committing manifest 61 committing manifest
62 committing changelog 62 committing changelog
63 rebasing 3:148775c71080 "P1" (p1.patch qtip) 63 rebasing 3:148775c71080 "P1" (p1.patch qtip)
64 resolving manifests 64 resolving manifests
65 note: rebase of 3:148775c71080 "P1" (p1.patch qtip) created no changes to commit 65 note: not rebasing 3:148775c71080 "P1" (p1.patch qtip), its destination already has all its changes
66 rebase merging completed 66 rebase merging completed
67 updating mq patch p0.patch to 5:9ecc820b1737 67 updating mq patch p0.patch to 5:9ecc820b1737
68 $TESTTMP/a/.hg/patches/p0.patch 68 $TESTTMP/a/.hg/patches/p0.patch
69 2 changesets found 69 2 changesets found
70 uncompressed size of bundle content: 70 uncompressed size of bundle content:
141 141
142 $ hg up -q qtip 142 $ hg up -q qtip
143 143
144 $ HGMERGE=internal:fail hg rebase 144 $ HGMERGE=internal:fail hg rebase
145 rebasing 1:b4bffa6e4776 "r1" (qbase r1) 145 rebasing 1:b4bffa6e4776 "r1" (qbase r1)
146 note: rebase of 1:b4bffa6e4776 "r1" (qbase r1) created no changes to commit 146 note: not rebasing 1:b4bffa6e4776 "r1" (qbase r1), its destination already has all its changes
147 rebasing 2:c0fd129beb01 "r2" (r2) 147 rebasing 2:c0fd129beb01 "r2" (r2)
148 rebasing 3:6ff5b8feed8e "r3" (r3) 148 rebasing 3:6ff5b8feed8e "r3" (r3)
149 note: rebase of 3:6ff5b8feed8e "r3" (r3) created no changes to commit 149 note: not rebasing 3:6ff5b8feed8e "r3" (r3), its destination already has all its changes
150 rebasing 4:094320fec554 "r4" (r4) 150 rebasing 4:094320fec554 "r4" (r4)
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
154 $ HGMERGE=internal:local hg resolve --all 154 $ HGMERGE=internal:local hg resolve --all
158 $ hg rebase --continue 158 $ hg rebase --continue
159 already rebased 1:b4bffa6e4776 "r1" (qbase r1) as 057f55ff8f44 159 already rebased 1:b4bffa6e4776 "r1" (qbase r1) as 057f55ff8f44
160 already rebased 2:c0fd129beb01 "r2" (r2) as 1660ab13ce9a 160 already rebased 2:c0fd129beb01 "r2" (r2) as 1660ab13ce9a
161 already rebased 3:6ff5b8feed8e "r3" (r3) as 1660ab13ce9a 161 already rebased 3:6ff5b8feed8e "r3" (r3) as 1660ab13ce9a
162 rebasing 4:094320fec554 "r4" (r4) 162 rebasing 4:094320fec554 "r4" (r4)
163 note: rebase of 4:094320fec554 "r4" (r4) created no changes to commit 163 note: not rebasing 4:094320fec554 "r4" (r4), its destination already has all its changes
164 rebasing 5:681a378595ba "r5" (r5) 164 rebasing 5:681a378595ba "r5" (r5)
165 rebasing 6:512a1f24768b "r6" (qtip r6) 165 rebasing 6:512a1f24768b "r6" (qtip r6)
166 note: rebase of 6:512a1f24768b "r6" (qtip r6) created no changes to commit 166 note: not rebasing 6:512a1f24768b "r6" (qtip r6), its destination already has all its changes
167 saved backup bundle to $TESTTMP/b/.hg/strip-backup/b4bffa6e4776-b9bfb84d-rebase.hg 167 saved backup bundle to $TESTTMP/b/.hg/strip-backup/b4bffa6e4776-b9bfb84d-rebase.hg
168 168
169 $ hg tglog 169 $ hg tglog
170 @ 8: 0b9735ce8f0a 'r5' tags: qtip r5 tip 170 @ 8: 0b9735ce8f0a 'r5' tags: qtip r5 tip
171 | 171 |