imerge loosing changes?

[Andreas Bernauer]

On Sun, 2008-04-13 at 01:11 +0300, Giorgos Keramidas wrote:
> > Now I want to merge the two heads rev [1] and rev [2].  imerge gives
> > me no conflicts, and hello.txt contains the text of rev 2:
> >
> > #/------------------------------
> > ~/tmp/test2$ hg imerge -r1
> > 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
> > (branch merge, don't forget to commit)
> > U hello.txt
> > ~/tmp/test2$ cat hello.txt
> > hello
> > my friends
> > #\------------------------------
> 
> Are you using an old copy of imerge?  The bundled imerge extension of
> a recent Mercurial snapshot gives:
> 
>     keramida at kobe:/tmp/hgtest/test2$ hg up -C
>     1 files updated, 0 files merged, 0 files removed, 0 files unresolved
>     keramida at kobe:/tmp/hgtest/test2$ hg imerge -r 1
>     1 files updated, 0 files merged, 0 files removed, 0 files unresolved
>     (branch merge, don't forget to commit)
>     U hello.txt
> 
> The 'U' marker is because the file is unresolved, and running another
> imerge iteration with:

I used a recent version (0.95 or 1.0), but I see I misinterpreted the
'U' as 'updated' instead of 'unresolved'.  I guess, this is what I was
missing.  Thank you for pointing this out to me!

Cheers,

Andreas.

-- 
WSI/TI, Sand 13, 72076 Tübingen, +49 70 71 29 75 940
http://www.ti.uni-tuebingen.de/Andreas_Bernauer.227.0.html
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: This is a digitally signed message part
Url : http://selenic.com/pipermail/mercurial/attachments/20080414/0dfccd13/attachment.pgp