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

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

templatefilters: add filter to convert date to local date (issue1674)...
templatefilters: add filter to convert date to local date (issue1674) Issue1674 suggests the localdate filter be applied as default to log, but this patch only introduces the filter, not the changed default behaviour.
Alexis S. L. Carvalho - - Load All Authors

File last commit:

r6256:69c75d06 default
r8591:08c93b07 default
Show More
test-merge-force
27 lines | 372 B | text/plain | TextLexer
/ tests / test-merge-force
History | Annotation | Raw |Copy content |Copy permalink
#!/bin/sh
hg init repo
cd repo
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'
hg up -qC 1
rm a
echo '% local deleted a file, remote removed'
hg merge # should fail, since there are deleted files
hg -v merge --force
echo % should show a as removed
hg st
hg ci -m merge
echo % manifest. should not have a:
hg manifest