##// END OF EJS Templates
largefiles: get function to write status messages via "getstatuswriter()"...
largefiles: get function to write status messages via "getstatuswriter()" This patch makes "updatelfiles()" get appropriate function to write largefiles specific status messages via "getstatuswriter()". This patch introduces None as "print messages if needed", because True (forcibly writing) and False (forcibly ignoring) are already used for "printmessage" of "updatelfiles". Subsequent patch will move "avoid printing messages only while automated committing" decision from caller of "updatelfiles()" into "getstatuswriter()".

File last commit:

r19802:94c39465 default
r23189:fb139f55 default
Show More
test-merge-force.t
45 lines | 670 B | text/troff | Tads3Lexer
$ hg init
$ echo a > a
$ hg ci -qAm 'add a'
$ echo b > b
$ hg ci -qAm 'add b'
$ hg up -qC 0
$ hg rm a
$ hg ci -m 'rm a'
created new head
$ hg up -qC 1
$ rm a
Local deleted a file, remote removed
Should fail, since there are deleted files:
$ hg merge
abort: uncommitted changes
(use 'hg status' to list changes)
[255]
Should succeed with --force:
$ hg -v merge --force
resolving manifests
removing a
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
(branch merge, don't forget to commit)
Should show 'a' as removed:
$ hg status
R a
$ hg ci -m merge
Should not show 'a':
$ hg manifest
b