How just to intercept merging "conflicts", nothing else

[Giovanni Gherdovich]

On Wed, Feb 5, 2014 at 3:56 PM, Marcin Kasperski <
Marcin.Kasperski at mekk.waw.pl> wrote:
>
> PS "In-memory" merge can be more-or-less achieved by:
>
>    hg clone .  /some/temp/dir/on/tmpfs
>    cd /some/temp/dir/on/tmpfs/
>    hg merge

if your repo is very large,
or you need to work on a NFS file system where I/O is very slow,
or you need to do very many of those "dry merges" to check for conflicts,
it's painfully slow and unpractical.

otherwise, sure, that's a possibility.

GGhh
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.mercurial-scm.org/pipermail/mercurial/attachments/20140205/f125426c/attachment-0002.html>