newbie question on hg update

[Lasse Vågsæther Karlsen]

On Thu, May 12, 2011 at 20:59, marwie <marwie at gmx.de> wrote:

> 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
>

Did you get a merge conflict when you updated, or did it update cleanly?

--
Lasse Vågsæther Karlsen
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.mercurial-scm.org/pipermail/mercurial/attachments/20110512/f9def575/attachment.html>