How just to intercept merging "conflicts", nothing else

Marcin Kasperski Marcin.Kasperski at mekk.waw.pl
Wed Feb 5 22:02:18 UTC 2014


>> 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.

If case of NFS file system with slow I/O - and complicated merge - it
may happen that clone to (very fast) filesystem may in fact make things
faster. Of course all depends on the history size, compressability of
files etc.




More information about the Mercurial mailing list