Mercurial > hg
view .hgignore @ 15399:41453d55b481 stable 2.0
dirstate: don't fail when dropping a not-tracked file (issue3080)
Complex merges with divergent renames can cause a file to be 'moved'
twice, causing dirstate.drop() to be called twice. Rather than try to
ensure there are no unexpected corner cases where this can happen, we
simply ignore drops of files that aren't tracked.
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Tue, 01 Nov 2011 15:19:37 -0500 |
parents | 0980239cb20c |
children | 64a80204433f |
line wrap: on
line source
syntax: glob *.elc *.orig *.rej *~ *.mergebackup *.o *.so *.dll *.pyd *.pyc *.pyo *$py.class *.swp *.prof \#*\# .\#* tests/.coverage* tests/annotated tests/*.err build contrib/hgsh/hgsh dist doc/*.[0-9] doc/*.[0-9].gendoc.txt doc/*.[0-9].{x,ht}ml MANIFEST MANIFEST.in patches mercurial/__version__.py mercurial.egg-info Output/Mercurial-*.exe .DS_Store tags cscope.* i18n/hg.pot locale/*/LC_MESSAGES/hg.mo hgext/__index__.py # files installed with a local --pure build mercurial/base85.py mercurial/bdiff.py mercurial/diffhelpers.py mercurial/mpatch.py mercurial/osutil.py mercurial/parsers.py syntax: regexp ^\.pc/ ^\.(pydev)?project