strange problem after merging

[Thomas Arendsen Hein]

* Soh Tk-r28629 <tksoh at freescale.com> [20050721 06:08]:
> There's seemed to be some problem with either revert or status.
> 
> After 'hg co -C -- -5', edited some files, 'hg co -m' then 'hg revert', 'hg status' still showed that the edited files has been changed, even though 'hg diff' gave empty output.
> 
> With Mercurial version fed842bb84b2. Comment?

I can reproduce this when "some files" include files that are
changed between -5 and tip. In this case a merge happens and
Mercurial want's you to commit the result of your merge, even if
what is merged looks like tip.

"hg co -C" will bring everything back to normal, but maybe you're
right, "hg revert" should have done so, too.

Attached is a test script, the output looks like this now:

+ mkdir t
+ cd t
+ hg init
+ echo 'added file1'
+ hg add file1
+ hg commit -t 'added file1' -d '0 0' -u user
+ echo 'changed file1'
+ hg commit -t 'changed file1' -d '0 0' -u user
+ hg update -C 0
+ echo 'changed file1'
+ hg revert
+ hg diff
+ hg status
+ hg update
+ hg diff
+ hg status
+ hg update -C 0
+ echo 'changed file1'
+ HGMERGE=merge
+ hg update
merging file1
+ hg diff
+ hg status
C file1
+ hg revert
+ hg diff
+ hg status
C file1                 <-- does this have to be here?
+ hg update -C
+ hg diff
+ hg status
+ cd ..
+ /bin/rm -rf t

Thomas

-- 
Email: thomas at intevation.de
http://intevation.de/~thomas/
-------------- next part --------------
#!/bin/sh -x

mkdir t
cd t
hg init
echo "added file1" > file1
echo "added file2" > file2
hg add file1 file2
hg commit -t "added file1 and file2" -d "0 0" -u user
echo "changed file1" >> file1
hg commit -t "changed file1" -d "0 0" -u user
hg update -C 0
echo "changed file1" >> file1
hg revert
hg diff
hg status
hg update
hg diff
hg status
hg update -C 0
echo "changed file1" >> file1
HGMERGE=merge hg update
hg diff
hg status
hg revert
hg diff
hg status
hg update -C
hg diff
hg status
cd ..; /bin/rm -rf t