Issue2095

Title incorrect rebase with renames+deletions
Priority bug Status chatting
Superseder Nosy List astratto, djc, jbmohler, tonfa
Assigned To astratto Topics rebase

Created on 2010-03-13.22:30:13 by tonfa, last changed 2011-07-19.18:54:20 by astratto.

Files
File name Uploaded Type Edit Remove
test-issue2095-merge.t astratto, 2011-07-19.18:51:20 text/troff
test-issue2095-rebase.t astratto, 2011-07-19.18:51:08 text/troff
Messages
msg16912 (view) Author: astratto Date: 2011-07-19.18:54:19
Hi, I was trying to write a small test for this issue, but I can't tell any 
difference.
Could you please modify the tests I've attached in order to reproduce this 
issue?

Thanks
msg12045 (view) Author: tonfa Date: 2010-03-13.22:30:13
When there is only one cset, merge and rebase should find the same result, 
it's not always the case:

hg init repo
cd repo
mkdir t
for i in a b c d e ;
do	echo $i > t/$i
done
hg ci -Am init
hg mv t tt
hg ci -m rename


hg up 0
echo f > t/f
hg add t/f    # new
echo g > t/g  # unknown
hg rm t/a     # removed
echo b >> t/b # modified
hg st -A
hg ci -m m
hg diff -c tip
hg up -C 1
#hg --debug merge
hg rebase -s 2 -d 1
hg diff -c tip
#hg --debug up
hg st -A

At the end, 'a' isn't removed in the renamed directory, merge does it 
correctly.
History
Date User Action Args
2011-07-19 18:54:20astrattosetstatus: unread -> chatting
assignedto: astratto
messages: + msg16912
nosy: tonfa, djc, astratto, jbmohler
2011-07-19 18:51:20astrattosetfiles: + test-issue2095-merge.t
nosy: tonfa, djc, astratto, jbmohler
2011-07-19 18:51:08astrattosetfiles: + test-issue2095-rebase.t
nosy: tonfa, djc, astratto, jbmohler
2011-01-14 15:16:48jbmohlersetnosy: + jbmohler
2010-03-15 08:31:02djcsetnosy: + djc
2010-03-13 22:30:13tonfacreate