##// END OF EJS Templates
filemerge: add internal merge tool to dump files forcibly...
filemerge: add internal merge tool to dump files forcibly Internal merge tool :dump implies premerge. Therefore, files aren't dumped, if premerge runs successfully. This undocumented behavior might confuse users, if they want to always dump files. But just making :dump omit premerge might cause backward compatibility issue for existing automation. This patch adds new internal merge tool :forcedump, which works as same as :dump, but omits premerge always. Internal tools annotated with "nomerge" should merge "change and delete" correctly, but _forcedump() can't. Therefore, it is annotated with "mergeonly" to always omit premerge, even though it doesn't merge files actually. This patch also adds explanation about premerge to :dump, to clarify how :dump actually works. BTW, this patch specifies internal tools with "internal:" prefix in newly added test scenario in test-merge-tools.t, even though this prefix is already deprecated. This is only for similarity to other tests in test-merge-tools.t.

File last commit:

r23348:bbe56e07 default
r32255:7e35d31b default
Show More
test-manifest.t
77 lines | 1.1 KiB | text/troff | Tads3Lexer
Matt Mackall
tests: fix a bunch of pointless #s in unified tests
r12328 Source bundle was generated with the following script:
Adrian Buehlmann
tests: unify test-manifest*
r12253 # hg init
# echo a > a
# ln -s a l
# hg ci -Ama -d'0 0'
# mkdir b
# echo a > b/a
# chmod +x b/a
# hg ci -Amb -d'1 0'
$ hg init
Nicolas Dumazet
tests: move test bundles in a bundles/ subdirectory
r14116 $ hg -q pull "$TESTDIR/bundles/test-manifest.hg"
Adrian Buehlmann
tests: unify test-manifest*
r12253
The next call is expected to return nothing:
$ hg manifest
$ hg co
3 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg manifest
a
b/a
l
Matt Mackall
files: add new command unifying locate and manifest functionality
r22423 $ hg files -vr .
2 a
Matt Harbison
tests: fix globs for Windows...
r23348 2 x b/a (glob)
Matt Mackall
files: add new command unifying locate and manifest functionality
r22423 1 l l
$ hg files -r . -X b
a
l
Adrian Buehlmann
tests: unify test-manifest*
r12253 $ hg manifest -v
644 a
755 * b/a
644 @ l
$ hg manifest --debug
b789fdd96dc2f3bd229c1dd8eedf0fc60e2b68e3 644 a
b789fdd96dc2f3bd229c1dd8eedf0fc60e2b68e3 755 * b/a
047b75c6d7a3ef6a2243bd0e99f94f6ea6683597 644 @ l
$ hg manifest -r 0
a
l
$ hg manifest -r 1
a
b/a
l
$ hg manifest -r tip
a
b/a
l
$ hg manifest tip
a
b/a
l
Adrian Buehlmann
add new option --all to manifest command...
r14399 $ hg manifest --all
a
b/a
l
Adrian Buehlmann
tests: unify test-manifest*
r12253
The next two calls are expected to abort:
$ hg manifest -r 2
abort: unknown revision '2'!
Matt Mackall
tests: add exit codes to unified tests
r12316 [255]
Adrian Buehlmann
tests: unify test-manifest*
r12253
$ hg manifest -r tip tip
abort: please specify just one revision
Matt Mackall
tests: add exit codes to unified tests
r12316 [255]