Cannot understand "update REV" behaviour

Stephane Bortzmeyer bortzmeyer at nic.fr
Fri Sep 16 09:35:17 CDT 2005


I have a changeset which only creates a file:

 % hg log -p -r 0           
changeset:   0:683d5fc3756510f138115255e3a2fbdea4bc04e0
user:        bortzmeyer at batilda.nic.fr
date:        Mon Aug  1 16:18:37 2005
summary:     Premier fichier ajoute au depot Mercurial

diff -r 000000000000 -r 683d5fc37565 Appartement/guerin-fin.tex
--- /dev/null   Thu Jan  1 00:00:00 1970
+++ b/Appartement/guerin-fin.tex        Mon Aug  1 14:18:37 2005
...

The file was accidentally deleted later and I want to recreate it. But
"hg update -m 0" has the side-effect of deleting other files, which do
not depend on the above and are not mentioned in changeset 0:

% hg update --debug -m 0
resolving manifests
 force None allow None moddirstate True linear True
 ancestor 143975a296c9 local 5b98ab6bd0f4 remote 143975a296c9
remote deleted Homelink/Italie-Rome-2005.lettre
remote deleted lettre-modele.tex
local deleted Appartement/guerin-fin.tex, recreating
getting Appartement/guerin-fin.tex
removing lettre-modele.tex

Why is lettre-modele.tex (which appeared later in the history) is
deleted when I merge the changeset 0?


More information about the Mercurial mailing list