newbie question on hg update

[Gilles Moris]

On Saturday 14 May 2011 12:04:00 am Lasse Vågsæther Karlsen wrote:
> On Fri, May 13, 2011 at 23:41, Gilles Moris <gilles.moris at free.fr> wrote:
> > On Thursday 12 May 2011 09:29:18 pm marwie wrote:
> > > Nope, no conflict. Just the output I posted:
> > >
> > > merging test.txt
> > > 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
> > >
> > > Lasse Vågsæther Karlsen wrote:
> > > > On Thu, May 12, 2011 at 20:59, marwie <marwie at gmx.de> wrote:
> > > >
> > > > Did you get a merge conflict when you updated, or did it update
> >
> > cleanly?
> >
> > > > --
> > > > Lasse Vågsæther Karlsen
> >
> > Which version of mercurial are running ?
> > $ hg version
> >
> > I cannot reproduce the problem with the latest hg 1.8.3, but I can if I
> > go back to hg 1.5. Possibly fix in 1.6 so.
>
> I too tested in 1.8.3, and I do get a conflict.

Conflict? Hum! Can you check my test script:

% cat hgtest.sh
#!/bin/sh -e

hg=`which hg`
export HGRCPATH=

$hg version

rm -rf hgtest

$hg init hgtest
cd hgtest
cat > test.txt <<EOF
foo
bar
baz
EOF

$hg add test.txt
$hg ci -u test -d '0 0' -m init

cat > test.txt <<EOF
foo 1
bar
baz
EOF

$hg ci -u test -d '0 0' -m foo1
$hg log

cat > test.txt <<EOF
foo 1
bar
baz 3
EOF

$hg update --debug 0
cat test.txt

# END hgtest.sh

% ./hgtest.sh
Mercurial Distributed SCM (version 1.8.3)
(see http://mercurial.selenic.com for more information)

Copyright (C) 2005-2011 Matt Mackall and others
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
changeset:   1:50e14ffc4bc5
tag:         tip
user:        test
date:        Thu Jan 01 00:00:00 1970 +0000
summary:     foo1

changeset:   0:82de3ebe7a5f
user:        test
date:        Thu Jan 01 00:00:00 1970 +0000
summary:     init

resolving manifests
 overwrite False partial False
 ancestor 50e14ffc4bc5 local 50e14ffc4bc5+ remote 82de3ebe7a5f
 test.txt: versions differ -> m
preserving test.txt for resolve of test.txt
updating: test.txt 1/1 files (100.00%)
couldn't find merge tool hgmerge
picked tool 'internal:merge' for test.txt (binary False symlink False)
merging test.txt
my test.txt at 50e14ffc4bc5+ other test.txt at 82de3ebe7a5f ancestor 
test.txt at 50e14ffc4bc5
 premerge successful
0 files updated, 1 files merged, 0 files removed, 0 files unresolved
foo
bar
baz 3