merge on update
TK Soh
teekaysoh at gmail.com
Sun May 6 14:32:39 UTC 2007
On 5/5/07, Johannes Hofmann <Johannes.Hofmann at gmx.de> wrote:
> 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.
IIRC, a similar issue has been brought up on the irc, and the
developers are aware of the issue. Not sure if anyone is work on this
though.
More information about the Mercurial
mailing list