##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

tests: update annotate tests to work around simplemerge bug...
tests: update annotate tests to work around simplemerge bug test-annotate.t and test-fastannotate.hg were failing with --pure since 57203e0210f8 (copies: calculate mergecopies() based on pathcopies(), 2019-04-11). It turned out to be because the pure file merge code behaved differently. I'm guessing it's the mdiff.get_matching_blocks() that behaves differently, but I haven't confirmed that. With this content in the base: a a a And this on the local side: a z a And this on the other side: a a a b4 c b6 It produced this conflict: a z a <<<<<<< working copy: b80e3e32f75a - test: c ||||||| base a ======= a b4 c b5 >>>>>>> merge rev: 64afcdf8e29e - test: mergeb I don't care enough about the pure Python code to fix it, so this patch just updates the tests to manually resolve the conflict. Differential Revision: https://phab.mercurial-scm.org/D6351
Yuya Nishihara - - Load All Authors

File last commit:

r40003:aab43d58 default
r42446:d5b35d69 default
Show More
.hgignore
70 lines | 870 B | text/plain | TextLexer
/ .hgignore
History | Source | Raw |Copy content |Copy permalink
Bryan O'Sullivan
Switch to new syntax for .hgignore files....
 r1270 syntax: glob
*.elc
Simon Heimberg
Makefile: do update on a temporary copy of a po file...
 r19991 *.tmp
Bryan O'Sullivan
Switch to new syntax for .hgignore files....
 r1270 *.orig
*.rej
*~
Bryan O'Sullivan
Ignore mergebackup files generated by mpatch
 r5019 *.mergebackup
Vadim Gelfer
contrib: add restricted shell.
 r2341 *.o
Bryan O'Sullivan
Switch to new syntax for .hgignore files....
 r1270 *.so
Craig Leres
hgignore: ignore dll files generated under cygwin
 r13643 *.dll
Adrian Buehlmann
hgignore: simply ignore all *.exe's everywhere...
 r17115 *.exe
Adrian Buehlmann
ignore *.pyd files...
 r6551 *.pyd
Bryan O'Sullivan
Switch to new syntax for .hgignore files....
 r1270 *.pyc
Simon Heimberg
hgignore: ignore more bytecode...
 r13346 *.pyo
*$py.class
Bryan O'Sullivan
Switch to new syntax for .hgignore files....
 r1270 *.swp
*.prof
Adrian Buehlmann
hgignore: ignore zip files
 r17274 *.zip
Bryan O'Sullivan
win32text: be more careful about rejecting violating changesets...
 r8147 \#*\#
.\#*
Boris Feld
sparse-revlog: add a test checking revlog deltas for a churning file...
 r39527 tests/artifacts/cache/big-file-churn.hg
Vadim Gelfer
let run-tests run optional code coverage tests....
 r2068 tests/.coverage*
Bryan O'Sullivan
tests: write recent run times to a file named tests/.testtimes...
 r27634 tests/.testtimes*
David R. MacIver
testing: generate tests operations using Hypothesis...
 r28255 tests/.hypothesis
tests/hypothesis-generated
Thomas Arendsen Hein
Ignore annotated coverage output of run-tests.py -C
 r2151 tests/annotated
Gregory Szorc
run-tests: mechanism to report exceptions during test execution...
 r35191 tests/exceptions
Bryan O'Sullivan
Switch to new syntax for .hgignore files....
 r1270 tests/*.err
Markus Zapke-Gründemann
tests: add htmlcov option
 r15859 tests/htmlcov
Bryan O'Sullivan
Switch to new syntax for .hgignore files....
 r1270 build
Yuya Nishihara
hgignore: ignore chg binary
 r28061 contrib/chg/chg
Vadim Gelfer
contrib: add restricted shell.
 r2341 contrib/hgsh/hgsh
anatoly techtonik
contrib/vagrant: use Vagrant for running tests on virtual machine...
 r21874 contrib/vagrant/.vagrant
Bryan O'Sullivan
Switch to new syntax for .hgignore files....
 r1270 dist
Matt Mackall
packaging: move output directory from build/ to packages/...
 r21560 packages
Takumi IINO
doc: make man and html from translated documents...
 r19426 doc/common.txt
Bryan O'Sullivan
Switch to new syntax for .hgignore files....
 r1270 doc/*.[0-9]
Takumi IINO
doc: make man and html from translated documents...
 r19426 doc/*.[0-9].txt
Thomas Arendsen Hein
Ignore generated documentation
 r1817 doc/*.[0-9].gendoc.txt
Bryan O'Sullivan
Switch to new syntax for .hgignore files....
 r1270 doc/*.[0-9].{x,ht}ml
MANIFEST
Thomas Arendsen Hein
hgignore: ignore MANIFEST.in (generated since 2ce7dfe17bc5)
 r14560 MANIFEST.in
Bryan O'Sullivan
Switch to new syntax for .hgignore files....
 r1270 patches
timeless
setup: create a module for the modulepolicy...
 r28430 mercurial/__modulepolicy__.py
Bryan O'Sullivan
Switch to new syntax for .hgignore files....
 r1270 mercurial/__version__.py
Adrian Buehlmann
exewrapper: adapt for legacy HackableMercurial...
 r17732 mercurial/hgpythonlib.h
Lee Cantey
Ignore mercurial.egg-info build output
 r11380 mercurial.egg-info
Lee Cantey
Ignore .DS_Store directories...
 r2987 .DS_Store
Kirill Smelkov
.hgignore += tags & cscope files
 r5693 tags
cscope.*
Angel Ezquerra
hgignore: ignore the PyCharm workspace folder
 r22945 .idea/*
Philippe Pepiot
perf: add asv benchmarks...
 r30406 .asv/*
Martin Geisler
i18n: let Makefile generate i18n/hg.pot...
 r7648 i18n/hg.pot
Martin Geisler
i18n: new build_mo command for setup.py...
 r7649 locale/*/LC_MESSAGES/hg.mo
Yuya Nishihara
setup: add command to generate index of extensions...
 r14538 hgext/__index__.py
Bryan O'Sullivan
Switch to new syntax for .hgignore files....
 r1270
Gregory Szorc
rust: implementation of `hg`...
 r35587 rust/target/
Yuya Nishihara
rust-chg: add project skeleton...
 r40003 rust/*/target/
Gregory Szorc
rust: implementation of `hg`...
 r35587
Boris Feld
packaging: add make target for linux wheels...
 r32080 # Generated wheels
wheelhouse/
Bryan O'Sullivan
Switch to new syntax for .hgignore files....
 r1270 syntax: regexp
Thomas Arendsen Hein
Ignore test error files, protect dot in .pc/
 r794 ^\.pc/
Brendan Cully
Ignore eclipse droppings
 r7439 ^\.(pydev)?project
Laurens Holst
ignore: add files present in the hackable-hg windows distribution
 r15702
# hackable windows distribution additions
Mads Kiilerich
update .hgignore for hackable with Python 2.7
 r16537 ^hg-python
Laurens Holst
ignore: add files present in the hackable-hg windows distribution
 r15702 ^hg.py$