D6132: test: demonstrate crash with in-memory rebase and copies
martinvonz (Martin von Zweigbergk)
phabricator at mercurial-scm.org
Fri Mar 15 09:55:32 EDT 2019
This revision was automatically updated to reflect the committed changes.
Closed by commit rHGdd1ab72be983: test: demonstrate crash with in-memory rebase and copies (authored by martinvonz, committed by ).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D6132?vs=14495&id=14504
REVISION DETAIL
https://phab.mercurial-scm.org/D6132
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
@@ -718,3 +718,43 @@
diff --git a/foo.txt b/foo.txt
old mode 100644
new mode 100755
+
+Test rebasing a commit with copy information, but no content changes
+
+ $ cd ..
+ $ hg clone -q repo1 merge-and-rename
+ $ cd merge-and-rename
+ $ cat << EOF >> .hg/hgrc
+ > [experimental]
+ > evolution.createmarkers=True
+ > evolution.allowunstable=True
+ > EOF
+ $ hg co -q 1
+ $ hg mv d e
+ $ hg ci -qm 'rename d to e'
+ $ hg co -q 3
+ $ hg merge -q 4
+ $ hg ci -m 'merge'
+ $ hg co -q 2
+ $ mv d e
+ $ hg addremove -qs 0
+ $ hg ci -qm 'untracked rename of d to e'
+ $ hg debugobsolete -q `hg log -T '{node}' -r 4` `hg log -T '{node}' -r .`
+ 1 new orphan changesets
+ $ hg tglog
+ @ 6: 676538af172d 'untracked rename of d to e'
+ |
+ | * 5: 71cb43376053 'merge'
+ | |\
+ | | x 4: 2c8b5dad7956 'rename d to e'
+ | | |
+ | o | 3: ca58782ad1e4 'b'
+ |/ /
+ o / 2: 814f6bd05178 'c'
+ |/
+ o 1: 02952614a83d 'd'
+ |
+ o 0: b173517d0057 'a'
+
+ $ hg rebase -b 5 -d tip 2>&1 | grep '** ProgrammingError'
+ ** ProgrammingError: markcopied() called on clean context
To: martinvonz, #hg-reviewers, pulkit
Cc: mercurial-devel
More information about the Mercurial-devel
mailing list