facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-10 08:47:12 +03:00
Code Issues Projects Releases Wiki Activity
093e742c00
sapling/mercurial
History
Siddharth Agarwal 093e742c00 merge: add options to warn or ignore on colliding unknown files 
A 'colliding unknown file' is a file that meets all of the following
conditions:

- is untracked or ignored on disk
- is present in the changeset being merged or updated to
- has different contents

Previously, we would always abort whenever we saw such files. With this config
option we can choose to warn and back the unknown files up instead, or even
forgo the warning entirely and silently back the unknown files up.

Common use cases for this configuration include a large scale transition of
formerly ignored unknown files to tracked files. In some cases the files can be
given new names, but in other cases, external "convention over configuration"
constraints have determined that the file must retain the same name as before.
2016-01-02 03:11:52 -08:00
..
default.d mergetools.rc: find OSX FileMerge in the new location inside Xcode 4.3 2015-10-16 11:37:34 +02:00
help merge: add options to warn or ignore on colliding unknown files 2016-01-02 03:11:52 -08:00
hgweb hgweb: support rendering a sub-topic 2015-12-30 17:15:10 -07:00
httpclient httpclient: update to 938f2107d6e2 of httpplus 2015-12-31 13:19:20 -05:00
pure osutil: c_ssize_t is only available in Python >= 2.7 2015-12-22 21:38:06 -08:00
templates templates: support linking to main help page 2015-12-30 17:26:33 -07:00
__init__.py mercurial: support loading modules from zipimporter 2015-12-03 21:25:05 -08:00
ancestor.py ancestor: use absolute_import 2015-08-07 19:45:48 -07:00
archival.py error: get Abort from 'error' instead of 'util' 2015-10-08 12:55:45 -07:00
base85.c base85: clean up function definition style 2015-11-11 19:10:45 -05:00
bdiff.c bdiff: avoid a memory error on malloc failure 2013-10-30 16:03:42 -05:00
bookmarks.py bookmark: deprecate 'bmstore.write' method 2015-12-05 23:34:07 -08:00
branchmap.py error: get Abort from 'error' instead of 'util' 2015-10-08 12:55:45 -07:00
bundle2.py bundle2: attribute remote failures to remote (issue4788) 2015-10-24 00:39:22 +01:00
bundlerepo.py bundlerepo: properly extract compressed changegroup from bundle2 2015-10-19 16:01:55 +02:00
byterange.py byterange: use absolute_import 2015-12-21 21:42:14 -08:00
changegroup.py changegroup: add flags field to cg3 delta header 2015-12-14 15:55:12 -05:00
changelog.py changelog: add a new method to get files modified by a changeset 2015-12-18 13:45:55 -08:00
cmdutil.py origpath: move from cmdutil to scmutil 2016-01-02 03:02:57 -08:00
commands.py origpath: move from cmdutil to scmutil 2016-01-02 03:02:57 -08:00
commandserver.py commandserver: reset state of progress bar per command 2015-12-14 23:50:02 +09:00
config.py config: use absolute_import 2015-08-08 00:28:53 -07:00
context.py cleanup: remove superfluous space after space after equals (python) 2015-12-31 08:16:59 +00:00
copies.py spelling: trivial spell checking 2015-10-17 00:58:46 +02:00
crecord.py crecord: stop raising error.Abort if curses is not found (issue5008) 2015-12-16 10:39:00 -08:00
dagparser.py error: get Abort from 'error' instead of 'util' 2015-10-08 12:55:45 -07:00
dagutil.py dagutil: use absolute_import 2015-08-08 19:04:09 -07:00
demandimport.py demandimport: update obsolete comment 2015-12-23 16:22:20 -08:00
destutil.py destutil: use scmutil.revrange for desthistedit (issue5001) 2015-12-24 10:16:30 -08:00
diffhelpers.c diffhelpers: fix botched return statement from e48d70075d8a 2015-01-28 13:34:20 -05:00
dirs.c dirs._addpath: reinstate use of Py_CLEAR 2015-04-07 20:43:04 -07:00
dirstate.py dirstate: call the C implementation of nonnonormalentries when available 2015-12-23 13:16:03 -08:00
discovery.py discovery: pass pushop to _nowarnheads 2015-11-10 11:16:25 -08:00
dispatch.py error: make InterventionRequired take a hint 2015-12-23 08:52:52 +00:00
dummycert.pem ssl: on OS X, use a dummy cert to trick Python/OpenSSL to use system CA certs 2014-09-26 02:19:48 +02:00
encoding.py encoding: use double backslash 2015-12-12 23:26:12 -08:00
error.py error: make InterventionRequired take a hint 2015-12-23 08:52:52 +00:00
exchange.py pull: make a single call to obsstore.add (issue5006) 2015-12-18 13:53:50 -06:00
exewrapper.c exewrapper: add comments about PYTHONHOME 2015-10-14 12:23:49 +02:00
extensions.py cleanup: remove superfluous space after space after equals (python) 2015-12-31 08:16:59 +00:00
fancyopts.py error: get Abort from 'error' instead of 'util' 2015-10-08 12:55:45 -07:00
filelog.py filelog: use absolute_import 2015-08-08 19:11:42 -07:00
filemerge.py origpath: move from cmdutil to scmutil 2016-01-02 03:02:57 -08:00
fileset.py fileset: add hint for list error to use or 2015-12-23 17:54:13 +00:00
formatter.py error: get Abort from 'error' instead of 'util' 2015-10-08 12:55:45 -07:00
graphmod.py graphmod: compute slow revset query once prior to reachableroots (issue4782) 2015-09-08 23:00:44 +09:00
hbisect.py hbisect: use tryreadlines to load state 2015-12-27 23:55:54 +09:00
help.py internals: document revlog format 2015-12-30 16:21:57 -07:00
hg.py cleanup: remove superfluous space after space after equals (python) 2015-12-31 08:16:59 +00:00
hook.py dirstate: don't write repo.currenttransaction to repo.dirstate if repo 2015-12-03 01:38:21 +01:00
httpconnection.py httpconnection: use absolute_import 2015-12-21 21:52:58 -08:00
httppeer.py cleanup: remove superfluous space after space after equals (python) 2015-12-31 08:16:59 +00:00
i18n.py i18n: use absolute_import 2015-08-08 19:28:49 -07:00
keepalive.py keepalive: use print function 2015-06-21 23:14:54 -07:00
localrepo.py localrepo: use absolute_import 2015-12-23 12:30:14 -08:00
lock.py lock: add a way to prevent locks from being inherited 2015-10-06 13:13:31 -07:00
lsprof.py lsprof: use print function 2016-01-02 11:40:53 -08:00
lsprofcalltree.py lsprofcalltree: use print function 2016-01-02 11:45:29 -08:00
mail.py mail: use print function 2016-01-02 11:47:07 -08:00
manifest.c lazymanifest: check error return in filter 2015-12-31 13:45:48 -05:00
manifest.py manifest: use absolute_import 2015-12-21 21:35:46 -08:00
match.py match: add option to return line and lineno from readpattern 2015-12-26 19:40:38 -08:00
mdiff.py mdiff: use absolute_import 2015-12-21 21:26:14 -08:00
merge.py merge: add options to warn or ignore on colliding unknown files 2016-01-02 03:11:52 -08:00
minirst.py help: include section heading if section depth changes 2016-01-01 16:59:13 +00:00
mpatch.c mpatch: rewrite pointer overflow checks 2013-12-11 18:33:42 -06:00
namespaces.py namespaces: use absolute_import 2015-08-08 19:42:58 -07:00
node.py node: add 'nullhex', hex-encoded nullid 2015-11-16 11:23:32 -08:00
obsolete.py obsolete: use absolute_import 2015-12-12 13:30:47 -05:00
osutil.c osutil: implement recvmsg() of SCM_RIGHTS for chg command server 2015-12-17 23:41:46 +09:00
parser.py parser: move unescape helper from templater 2015-09-10 23:25:10 +09:00
parsers.c cleanup: remove superfluous space after space after equals (C) 2015-12-31 08:17:15 +00:00
patch.py patch: use absolute_import 2015-12-21 21:33:52 -08:00
pathencode.c pathencode: remove an unused assignment 2015-12-12 20:59:37 -08:00
pathutil.py pathutil: use temporary variables instead of complicated wrapping 2015-12-03 13:14:20 -08:00
peer.py peer: use absolute_import 2015-08-08 19:45:45 -07:00
phases.py phase: improve retractboundary perf 2015-11-07 16:11:49 -08:00
posix.py mac: fix percent-encoding of non-utf-8 characters (issue4999) 2015-12-12 21:36:21 -06:00
progress.py spelling: trivial spell checking 2015-10-17 00:58:46 +02:00
pushkey.py pushkey: use absolute_import 2015-08-08 19:57:27 -07:00
pvec.py pvec: use absolute_import 2015-12-21 21:32:58 -08:00
py3kcompat.py py3compat: use absolute_import 2015-12-21 21:31:57 -08:00
registrar.py registrar: add delayregistrar class to register function in extensions 2015-12-29 23:58:30 +09:00
repair.py repair: improves documentation of strip regarding locks 2015-12-29 10:21:39 -08:00
repoview.py repoview: bypass changelog method to computed cache key 2015-12-04 14:22:15 -08:00
revlog.py revlog: remove unnecessary cache validation in _chunks 2015-11-22 17:57:35 -08:00
revset.py cleanup: remove superfluous space after space after equals (python) 2015-12-31 08:16:59 +00:00
scmposix.py scmposix: use absolute_import 2015-12-21 21:24:49 -08:00
scmutil.py origpath: move from cmdutil to scmutil 2016-01-02 03:02:57 -08:00
scmwindows.py scmwindows: use absolute_import 2015-12-21 21:21:09 -08:00
setdiscovery.py error: get Abort from 'error' instead of 'util' 2015-10-08 12:55:45 -07:00
similar.py similar: use absolute_import 2015-12-12 23:17:22 -08:00
simplemerge.py simplemerge: move conflict warning message to filemerge 2015-10-09 13:54:52 -07:00
sshpeer.py spelling: trivial spell checking 2015-10-17 00:58:46 +02:00
sshserver.py error: get Abort from 'error' instead of 'util' 2015-10-08 12:55:45 -07:00
sslutil.py sslutil: expose attribute indicating whether SNI is supported 2015-09-29 16:17:32 -07:00
statichttprepo.py error: get Abort from 'error' instead of 'util' 2015-10-08 12:55:45 -07:00
store.py store: use absolute_import 2015-12-21 21:19:57 -08:00
streamclone.py streamclone: use read() 2016-01-02 15:14:55 -08:00
strutil.py strutil: use absolute_import 2015-08-08 20:01:40 -07:00
subrepo.py origpath: move from cmdutil to scmutil 2016-01-02 03:02:57 -08:00
tagmerge.py tagmerge: use absolute_import 2015-08-08 20:10:46 -07:00
tags.py tags: create new sortdict for performance reasons 2015-11-12 13:16:04 -08:00
templatefilters.py merge with stable 2015-11-04 15:17:52 -06:00
templatekw.py templatekw: avoid slow creation of changectx objects in showgraphnode() 2015-11-14 17:02:57 +09:00
templater.py cleanup: remove superfluous space after space after equals (python) 2015-12-31 08:16:59 +00:00
transaction.py spelling: fix typo in transaction error messages 2015-10-17 15:28:02 -05:00
treediscovery.py error: get Abort from 'error' instead of 'util' 2015-10-08 12:55:45 -07:00
ui.py paths: do not process default-push as pushurl of default path (issue5000) 2015-12-26 16:06:12 +09:00
unionrepo.py changegroup: add flags field to cg3 delta header 2015-12-14 15:55:12 -05:00
url.py url: drop support for python2.5 2015-10-15 17:21:08 -04:00
util.h util.h: kill no longer needed definitions for Python < 2.6 2015-05-14 09:04:48 +02:00
util.py lrucachedict: add copy method 2015-12-30 13:10:53 -08:00
verify.py verify: get rid of some unnecessary local variables 2016-01-05 17:08:14 -08:00
win32.py win32: use absolute_import 2015-08-08 18:52:59 -07:00
windows.py windows: correct the import of win32 2015-12-16 13:33:43 -05:00
wireproto.py wireproto: support disabling bundle1 only if repo is generaldelta 2015-12-20 11:56:24 -08:00
worker.py error: get Abort from 'error' instead of 'util' 2015-10-08 12:55:45 -07:00