Is this the expected revert behaviour ?

Sébastien Pierre sebastien at xprima.com
Thu May 4 14:49:55 CDT 2006


Hi again,

Trying different merge options, I decided to revert my working directory
to a previous revision :

$ hg revert -r34
reverting LICENSE
reverting Scenarios/RandomFill.py
reverting Scenarios/Subdivide.py
reverting Scripts/rugg
reverting Sources/rugg/logger.py
reverting Sources/rugg/main.py
reverting Sources/rugg/typecast.py
reverting Tests/L001-LanguageSyntax.py
reverting Tests/U001-Units.py
reverting Tests/U002-Producers.py
reverting Tests/Z001-File.py
reverting Website/Pages/index.html.tmpl
reverting Website/Pages/screen.css
reverting Website/Templates/Base.tmpl
reverting Website/build.py
reverting setup.py

$ hg status
M LICENSE
M Scenarios/RandomFill.py
M Scenarios/Subdivide.py
M Scripts/rugg
M Sources/rugg/logger.py
M Sources/rugg/main.py
M Sources/rugg/typecast.py
M Tests/L001-LanguageSyntax.py
M Tests/U001-Units.py
M Tests/U002-Producers.py
M Tests/Z001-File.py
M Website/Pages/index.html.tmpl
M Website/Pages/screen.css
M Website/Templates/Base.tmpl
M Website/build.py
M setup.py
? LICENSE.orig
? Scenarios/RandomFill.py.orig
...

I don't get why this happens :

$ sha1sum  LICENSE.orig LICENSE
bcb1c416880a251fbbb57a999635b56f5a9025e5  LICENSE.orig
bcb1c416880a251fbbb57a999635b56f5a9025e5  LICENSE

So it looks like revert does not really work. Is it ?

 -- Sébastien







More information about the Mercurial mailing list