Mercurial > hg
view doc/hgrc.5.txt @ 16093:7e30f5f2285f
merge: refactor unknown file conflict checking
Previously, we would do a full working directory walk including
unknown files to perform a merge. In many cases, this was painful
because unknown files greatly outnumbered tracked files and generally
had no useful effect on the merge.
Here we instead wait until we find a file in the destination that's
not tracked locally and detect if it exists and is not ignored. This
is usually cheaper but can be -more- expensive in the case where we're
adding a huge number of files. On the other hand, the cost of statting
the new files should be dwarfed by the cost of eventually writing
them.
In this version, case collisions are detected implicitly by
os.path.exists and wctx[f] lookup.
| author | Matt Mackall <mpm@selenic.com> |
|---|---|
| date | Thu, 09 Feb 2012 16:50:19 -0600 |
| parents | d5f616132c10 |
| children | e49e039acd5e |
line wrap: on
line source
====== hgrc ====== --------------------------------- configuration files for Mercurial --------------------------------- :Author: Bryan O'Sullivan <bos@serpentine.com> :Organization: Mercurial :Manual section: 5 :Manual group: Mercurial Manual .. contents:: :backlinks: top :class: htmlonly Synopsis -------- .. include:: ../mercurial/help/config.txt Author ------ Bryan O'Sullivan <bos@serpentine.com>. Mercurial was written by Matt Mackall <mpm@selenic.com>. See Also -------- |hg(1)|_, |hgignore(5)|_ Copying ------- This manual page is copyright 2005 Bryan O'Sullivan. Mercurial is copyright 2005-2010 Matt Mackall. Free use of this software is granted under the terms of the GNU General Public License version 2 or any later version. .. include:: common.txt