newbie question on hg update

[marwie]

Hi,

I'm just getting started with mercurial and I'm having trouble with the
update function. I have created a test repository, added a file to it and
comitted the change

hg init hgtest
cd hgtest
hg add test.txt
hg commit -m "first commit"

The content of the file test.txt was

foo
bar
baz

Now I changed the first line to "foo 1" and comitted again. Then I change
the third line to "baz 3", but don't commit. Instead I call

hg update 0

This gives me the output

merging test.txt
0 files updated, 1 files merged, 0 files removed, 0 files unresolved

but the file still contains

foo 1
bar
baz 3

Now, the documentation tells me that uncommitted changes are merged into the
older version of the file, and that's also what the output of 'hg update 0'
suggests. But then the first line should just read 'foo', shouldn't it?

Best regards,
Martin.



--
View this message in context: http://mercurial.808500.n3.nabble.com/newbie-question-on-hg-update-tp2933068p2933068.html
Sent from the General mailing list archive at Nabble.com.