newbie question on hg update

[Lasse Vågsæther Karlsen]

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.

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