D6569: tests: demonstrate broken in-memory rebase of copy to empty file
martinvonz (Martin von Zweigbergk)
phabricator at mercurial-scm.org
Mon Jun 24 23:11:36 UTC 2019
martinvonz created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.mercurial-scm.org/D6569
AFFECTED FILES
tests/test-rebase-inmemory.t
CHANGE DETAILS
diff --git a/tests/test-rebase-inmemory.t b/tests/test-rebase-inmemory.t
--- a/tests/test-rebase-inmemory.t
+++ b/tests/test-rebase-inmemory.t
@@ -784,6 +784,28 @@
R a
$ cd ..
+Test rebasing a commit with copy information, where the target is empty
+
+ $ hg init rebase-rename-empty
+ $ cd rebase-rename-empty
+ $ echo a > a
+ $ hg ci -Aqm 'add a'
+ $ cat > a
+ $ hg ci -m 'make a empty'
+ $ 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 at c71e275f666f: not found in manifest!
+ [255]
+ $ hg st --copies --change .
+ A b
+ a
+ R a
+ $ cd ..
Rebase across a copy with --collapse
$ hg init rebase-rename-collapse
To: martinvonz, #hg-reviewers
Cc: mercurial-devel
More information about the Mercurial-devel
mailing list