comparison 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
comparison
equal deleted inserted replaced
42527:4a6826868625 42528:e079e001d536
793 $ cat > a 793 $ cat > a
794 $ hg ci -m 'make a empty' 794 $ hg ci -m 'make a empty'
795 $ hg co -q 0 795 $ hg co -q 0
796 $ hg mv a b 796 $ hg mv a b
797 $ hg ci -qm 'rename a to b' 797 $ hg ci -qm 'rename a to b'
798 BROKEN: shouldn't crash
799 $ hg rebase -d 1 798 $ hg rebase -d 1
800 rebasing 2:b977edf6f839 "rename a to b" (tip) 799 rebasing 2:b977edf6f839 "rename a to b" (tip)
801 merging a and b to b 800 merging a and b to b
802 abort: b@c71e275f666f: not found in manifest! 801 saved backup bundle to $TESTTMP/rebase-rename-empty/.hg/strip-backup/b977edf6f839-0864f570-rebase.hg
803 [255]
804 $ hg st --copies --change . 802 $ hg st --copies --change .
805 A b 803 A b
806 a 804 a
807 R a 805 R a
808 $ cd .. 806 $ cd ..