conflict file in *nix like systems

[Bastian Doetsch]

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
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://selenic.com/pipermail/mercurial/attachments/20081122/9656183b/attachment.htm 
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 197 bytes
Desc: Dies ist ein digital signierter Nachrichtenteil
Url : http://selenic.com/pipermail/mercurial/attachments/20081122/9656183b/attachment.pgp