conflict file in *nix like systems

[Bastian Doetsch]

Am Sonntag, den 23.11.2008, 21:23 +0100 schrieb Peter Pis:

> But what in case merge was for example canceled. Mercurial still knows
> that such file should be resolved and status shows only it's modified.
> Is there any command that tells whether file is in conflict?


You mean cancelled by using "hg update -C"? Then every merge status
should be back to normal. If you have just interrupted a merge, you can
use "hg resolve -l" to show files that need a merge. With stable you
need to enable imerge in your .hgrc (see
http://www.selenic.com/mercurial/wiki/index.cgi/ImergeExtension) and
then issue "hg imerge status".

Best regards
Bastian


> 
> Thanks,
> -Peter
> 
> 
> On Sat, Nov 22, 2008 at 3:18 PM, Bastian Doetsch
> <bastian.doetsch at gmx.de> wrote:
> 
>         Am Samstag, den 22.11.2008, 14:17 +0100 schrieb Isaac Jurado: 
>         
>         > On Fri, Nov 21, 2008 at 5:58 PM, Peter Pis <noelsunny at googlemail.com> wrote:
>         > >
>         > > on Mac Os and Linux (Fedora) no such file is created. So I'd like to
>         > > ask what's the mechanism that mercurial uses for finding out that
>         > > files are in conflict.
>         > 
>         > As of 1.0.2, conflicts should be resolved at merge time.  That is, each
>         > time a conflict is found, a resolution tool (depending on your
>         > configuration) pops up for each conflicting file.
>         
>         
>         
>         
>         In 1.0.2, afaik the imerge extension allows for interrupting
>         and continuing a merge.
>         
>         
>         
>         
>         > This will change in next release, as new commands have been introduced
>         > (in the development version) mimicking SVN conflict resolution.
>         
>         
>         
>         
>         Yep, hg resolve is available in current crew. Dunno whether
>         imerge started working again for crew, but it used to be
>         broken by the changes introduced for the resolve command.
>         
>         Best regards,
>         Bastian
> 
> 
> 
> _______________________________________________
> Mercurial mailing list
> Mercurial at selenic.com
> http://selenic.com/mailman/listinfo/mercurial
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.mercurial-scm.org/pipermail/mercurial/attachments/20081124/0917c262/attachment-0001.html>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 197 bytes
Desc: Dies ist ein digital signierter Nachrichtenteil
URL: <http://lists.mercurial-scm.org/pipermail/mercurial/attachments/20081124/0917c262/attachment-0001.asc>