Mercurial > hg
comparison tests/test-rebase-cache.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 | f90a5c211251 |
comparison
equal
deleted
inserted
replaced
| 40864:09680349cc2d | 40865:4edd427f34c1 |
|---|---|
| 229 |/ | 229 |/ |
| 230 o 0: 'A' | 230 o 0: 'A' |
| 231 | 231 |
| 232 $ hg rebase -s 7 -d 6 | 232 $ hg rebase -s 7 -d 6 |
| 233 rebasing 7:653b9feb4616 "branch3" | 233 rebasing 7:653b9feb4616 "branch3" |
| 234 note: rebase of 7:653b9feb4616 "branch3" created no changes to commit | 234 note: not rebasing 7:653b9feb4616 "branch3", its destination already has all its changes |
| 235 rebasing 8:4666b71e8e32 "F" (tip) | 235 rebasing 8:4666b71e8e32 "F" (tip) |
| 236 saved backup bundle to $TESTTMP/a3/.hg/strip-backup/653b9feb4616-3c88de16-rebase.hg | 236 saved backup bundle to $TESTTMP/a3/.hg/strip-backup/653b9feb4616-3c88de16-rebase.hg |
| 237 | 237 |
| 238 $ hg branches | 238 $ hg branches |
| 239 branch2 7:6b4bdc1b5ac0 | 239 branch2 7:6b4bdc1b5ac0 |