##// 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.
Thomas Arendsen Hein - - Load All Authors

File last commit:

r4659:7a7d4937 default
r8591:08c93b07 default
Show More
test-up-local-change
68 lines | 871 B | text/plain | TextLexer
/ tests / test-up-local-change
History | Annotation | Raw |Copy content |Copy permalink
#!/bin/sh
HGMERGE=true; export HGMERGE
set -e
mkdir r1
cd r1
hg init
echo a > a
hg addremove
hg commit -m "1" -d "1000000 0"
hg clone . ../r2
cd ../r2
hg up
echo abc > a
hg diff --nodates
cd ../r1
echo b > b
echo a2 > a
hg addremove
hg commit -m "2" -d "1000000 0"
cd ../r2
hg -q pull ../r1
hg status
hg parents
hg --debug up
hg parents
hg --debug up 0
hg parents
hg --debug merge || echo failed
hg parents
hg --debug up
hg parents
hg -v history
hg diff --nodates
# create a second head
cd ../r1
hg up 0
echo b2 > b
echo a3 > a
hg addremove
hg commit -m "3" -d "1000000 0"
cd ../r2
hg -q pull ../r1
hg status
hg parents
hg --debug up || echo failed
hg --debug merge || echo failed
hg --debug merge -f
hg parents
hg diff --nodates
# test a local add
cd ..
hg init a
hg init b
echo a > a/a
echo a > b/a
hg --cwd a commit -A -m a
cd b
hg add a
hg pull -u ../a
hg st