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

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

Add a pointer to "hg -v help" to the bottom of hg help {,cmd} output...
Add a pointer to "hg -v help" to the bottom of hg help {,cmd} output This should make it easier to discover global options. As a bonus, they are no longer displayed by something like a hg -v help dates
Thomas Arendsen Hein - - Load All Authors

File last commit:

r3988:9dcf9d45 default
r4315:bc6f5a1d default
Show More
test-merge-revert
44 lines | 612 B | text/plain | TextLexer
/ tests / test-merge-revert
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
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 --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" >> file1
HGMERGE=merge hg update
hg diff
hg status
hg id
Vadim Gelfer
revert: require --all to revert all files.
 r2982 hg revert --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 --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