Fwd: [mercurialeclipse] faulty merge, not handling changed/removed conflict

[Bastian Doetsch]

Sorry for the other message...I forwarded the wrong email.... Here's  
my mail again.

Hi all,

I got a question concerning merge that popped up at the  
MercurialEclipse list (see below). We use the following commands:

hg merge --config.ui.merge=simplemerge -r 977
hg resolve -l

which doesn't yield the removed file as unresolved.

Any suggestions why simplemerge doesn't recognize the conflict?

Best regards,
Bastian

Anfang der weitergeleiteten E-Mail:

> Von: Bastian Doetsch <bastian at doetsch.info>
> Datum: 17. Dezember 2008 21:03:48 MEZ
> An: mercurial at selenic.com
> Betreff: Fwd: [mercurialeclipse] faulty merge, not handling changed/ 
> removed conflict
>
> Hi all,
>
> I got a question concerning merge that popped up at the  
> MercurialEclipse list (see below). We use the following commands:
>
> hg merge --config.ui.merge=simplemerge -r 977
> hg resolve -l
>
> which doesn't yield the removed file as unresolved.
>
> Any suggestions why simplemerge doesn't recognize the conflict?
>
> Best regards,
> Bastian
>
> Anfang der weitergeleiteten E-Mail:
>
>> Von: Georg <gwk.rko at googlemail.com>
>> Datum: 16. Dezember 2008 16:34:20 MEZ
>> An: mercurialeclipse at googlegroups.com
>> Betreff: [mercurialeclipse] faulty merge, not handling changed/ 
>> removed conflict
>> Antwort an: mercurialeclipse at googlegroups.com
>>
>> Hi,
>>
>> I merged using the plugin (ver 1.2.954, Hg version 1.1) and at  
>> first everything looked fine.  Only later I noticed that there was  
>> a conflict, in my version I had modified two files when in the  
>> remote (to-be-merged) version those files were removed.  The  
>> mercurialeclipse merge silently took my version.
>>
>> It should have asked me whether I wanted to keep my version or  
>> delete the file, this is how hg command line and TortoiseHg handle  
>> it.
>>
>> --
>> Regards,
>> Georg.
>>
>>
>> --~--~---------~--~----~------------~-------~--~----~
>> You received this message because you are subscribed to the Google  
>> Groups "MercurialEclipse" group.
>> To post to this group, send email to  
>> mercurialeclipse at googlegroups.com
>> To unsubscribe from this group, send email to mercurialeclipse+unsubscribe at googlegroups.com
>> For more options, visit this group at http://groups.google.com/group/mercurialeclipse?hl=en
>> -~----------~----~----~----~------~----~------~--~---
>>
>

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.mercurial-scm.org/pipermail/mercurial/attachments/20081217/505f912b/attachment-0002.html>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: PGP.sig
Type: application/pgp-signature
Size: 194 bytes
Desc: Signierter Teil der Nachricht
URL: <http://lists.mercurial-scm.org/pipermail/mercurial/attachments/20081217/505f912b/attachment-0001.sig>