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

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

commit: abort on merge with missing files...
commit: abort on merge with missing files Here is a script illustrating the previous behaviour: The merge brings a new file 'b' from remote $ hg merge 1 --debug searching for copies back to rev 1 unmatched files in other: b resolving manifests overwrite: False, partial: False ancestor: 07f494440405, local: 540395c44225+, remote: 102a90ea7b4a b: remote created -> g updating: b 1/1 files (100.00%) getting b 1 files updated, 0 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit) Delete but do not remove b $ rm b $ hg st ! b The commit succeeds $ hg commit -m merge $ hg parents --template "{rev} {desc|firstline} files: {files}\n" 3 merge files: $ hg st ! b b changes were ignored, but even b existence was ignored $ hg manifest a This happens because localrepo.commitctx() checks the input ctx.files(), which is empty for workingctx.files() only returns added, modified or removed entries, and bypass files/manifest updates completely. So the committed revision manifest is the same as its first parent one, not containing the 'b' file. This patch forces the commit to abort in presence of a merge and missing files. test-merge4.t is modified accordingly as it was introduced to check hg was not just terminating with a traceback (5e9e8b8d2629).
Markus Zapke-Gründemann - - Load All Authors

File last commit:

r15859:44a37182 default
r16536:63c817ea stable
Show More
.hgignore
57 lines | 726 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
*.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
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
Bryan O'Sullivan
win32text: be more careful about rejecting violating changesets...
 r8147 \#*\#
.\#*
Vadim Gelfer
let run-tests run optional code coverage tests....
 r2068 tests/.coverage*
Thomas Arendsen Hein
Ignore annotated coverage output of run-tests.py -C
 r2151 tests/annotated
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
Vadim Gelfer
contrib: add restricted shell.
 r2341 contrib/hgsh/hgsh
Bryan O'Sullivan
Switch to new syntax for .hgignore files....
 r1270 dist
doc/*.[0-9]
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
mercurial/__version__.py
Lee Cantey
Ignore mercurial.egg-info build output
 r11380 mercurial.egg-info
Steve Borho
win32: ignore all installers generated in Output/
 r5622 Output/Mercurial-*.exe
Lee Cantey
Ignore .DS_Store directories...
 r2987 .DS_Store
Kirill Smelkov
.hgignore += tags & cscope files
 r5693 tags
cscope.*
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
Martin Geisler
use PURE option in Makefile
 r7706 # 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
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
^hg-python26/
^hg.exe$
^hg.py$