Mercurial > hg
diff tests/test-rebase-inmemory.t @ 42528:e079e001d536
rebase: fix in-memory rebasing of copy of empty file
Classic Python mistake of unintentionally treating None and empty
string the same.
Differential Revision: https://phab.mercurial-scm.org/D6570
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Mon, 24 Jun 2019 16:01:22 -0700 |
| parents | 4a6826868625 |
| children | 99ebde4fec99 |
line wrap: on
line diff
--- a/tests/test-rebase-inmemory.t Mon Jun 24 16:07:59 2019 -0700 +++ b/tests/test-rebase-inmemory.t Mon Jun 24 16:01:22 2019 -0700 @@ -795,12 +795,10 @@ $ hg co -q 0 $ hg mv a b $ hg ci -qm 'rename a to b' -BROKEN: shouldn't crash $ hg rebase -d 1 rebasing 2:b977edf6f839 "rename a to b" (tip) merging a and b to b - abort: b@c71e275f666f: not found in manifest! - [255] + saved backup bundle to $TESTTMP/rebase-rename-empty/.hg/strip-backup/b977edf6f839-0864f570-rebase.hg $ hg st --copies --change . A b a