fetch or push do what I don't expect

[Boris Samorodov]

On Sat, 6 Jan 2007 23:31:47 +0100 Robin Farine wrote:
> On Saturday January 6 2007 20:04, Boris Samorodov wrote:

> [...]

> > 1 files updated, 0 files merged, 0 files removed, 0 files
> > unresolved # cd test-3
> > # cat file
> > first line
> > third line
> > -----

> Which external merge tool are you using ? If the script below 

Assuming that merge.py defines:
-----
    cmd = (os.environ.get("HGMERGE") or repo.ui.config("ui", "merge")
           or "hgmerge")
-----

..then I use hgmerge, which in turn uses the system (FreeBSD-6.2-RC2)
merge.

> faithfully reproduces your example, running it causes the 'hg 
> fetch' line to launch kdiff3 for me to solve the conflict.

Yes, the script is just the same as my test.
OK, seems that one of merge or hgmerge has a bug. Thanks!


WBR
-- 
Boris Samorodov (bsam)
Research Engineer, http://www.ipt.ru Telephone & Internet SP
FreeBSD committer, http://www.FreeBSD.org The Power To Serve