merge on update

Johannes Hofmann Johannes.Hofmann at gmx.de
Sat May 5 03:18:16 CDT 2007


When I do the following on the mercurial repository:

hg up -C 1 
hg up

mercurial tries to merge merging mercurial/hg.py and
mercurial/changelog.py. Is this intended? There is a 
direct path from rev 1 to tip so I would expect that no merging is
required.

Regards,
Johannes


More information about the Mercurial mailing list