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

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

test-config-case: print only the Section we're interested in....
test-config-case: print only the Section we're interested in. This allows us to add additional settings to the global hgrc file created by run-tests.py without breaking this test.
Alexis S. L. Carvalho - - Load All Authors

File last commit:

r4387:93a4e72b default
r4528:85a69f4d default
Show More
test-merge-revert2
45 lines | 691 B | text/plain | TextLexer
/ tests / test-merge-revert2
History | Source | Raw |Copy content |Copy permalink
Thomas Arendsen Hein
Don't use 'set -x', fix exports, sed and hexdump usage for Solaris.
 r800 #!/bin/sh
Thomas Arendsen Hein
Added tests for bug with three-way-merging of old tip, tip and cwd.
 r792
mkdir t
cd t
hg init
echo "added file1" > file1
Thomas Arendsen Hein
Extended test case to test dirstate length bug fixed in a7e95e3606c7.
 r864 echo "another line of text" >> file1
Thomas Arendsen Hein
Added tests for bug with three-way-merging of old tip, tip and cwd.
 r792 echo "added file2" > file2
hg add file1 file2
Thomas Arendsen Hein
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero....
 r1933 hg commit -m "added file1 and file2" -d "1000000 0" -u user
Thomas Arendsen Hein
Added tests for bug with three-way-merging of old tip, tip and cwd.
 r792 echo "changed file1" >> file1
Thomas Arendsen Hein
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero....
 r1933 hg commit -m "changed file1" -d "1000000 0" -u user
Thomas Arendsen Hein
Added tests for bug with three-way-merging of old tip, tip and cwd.
 r792 hg -q log
hg id
hg update -C 0
hg id
echo "changed file1" >> file1
hg id
Vadim Gelfer
revert: require --all to revert all files.
 r2982 hg revert --no-backup --all
Thomas Arendsen Hein
Added tests for bug with three-way-merging of old tip, tip and cwd.
 r792 hg diff
hg status
hg id
hg update
hg diff
hg status
hg id
hg update -C 0
echo "changed file1 different" >> file1
Alexis S. L. Carvalho
change tests to use simplemerge by default
 r4365 hg update
Alexis S. L. Carvalho
run-tests.py: pass -L/--label to simplemerge...
 r4387 hg diff --nodates
Thomas Arendsen Hein
Added tests for bug with three-way-merging of old tip, tip and cwd.
 r792 hg status
hg id
Vadim Gelfer
revert: require --all to revert all files.
 r2982 hg revert --no-backup --all
Thomas Arendsen Hein
Added tests for bug with three-way-merging of old tip, tip and cwd.
 r792 hg diff
hg status
hg id
Vadim Gelfer
revert: require --all to revert all files.
 r2982 hg revert -r tip --no-backup --all
Thomas Arendsen Hein
Added tests for bug with three-way-merging of old tip, tip and cwd.
 r792 hg diff
hg status
hg id
hg update -C
hg diff
hg status
hg id