Mercurial > hg
comparison tests/test-rebase-mq.t @ 40865:4edd427f34c1
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 | dc5e5577af39 |
comparison
equal
deleted
inserted
replaced
| 40864:09680349cc2d | 40865:4edd427f34c1 |
|---|---|
| 335 empty-important | 335 empty-important |
| 336 bar | 336 bar |
| 337 foo | 337 foo |
| 338 $ [ -f .hg/patches/empty-important ] | 338 $ [ -f .hg/patches/empty-important ] |
| 339 $ hg -q rebase -d 2 | 339 $ hg -q rebase -d 2 |
| 340 note: rebase of 1:0aaf4c3af7eb "important commit message" (empty-important qbase) created no changes to commit | 340 note: not rebasing 1:0aaf4c3af7eb "important commit message" (empty-important qbase), its destination already has all its changes |
| 341 $ hg qseries | 341 $ hg qseries |
| 342 guarded | 342 guarded |
| 343 bar | 343 bar |
| 344 foo | 344 foo |
| 345 $ [ -f .hg/patches/empty-important ] | 345 $ [ -f .hg/patches/empty-important ] |