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

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

repo.status: also compare flags for files in the lookup list....
repo.status: also compare flags for files in the lookup list. We might be able to do something smarter about this in dirstate.status for files in normallookup state, but that would require some extra care to keep backwards compatibility.
Alexis S. L. Carvalho - - Load All Authors

File last commit:

r4365:46280c00 default
r6158:23ffe826 default
Show More
test-merge-revert
44 lines | 598 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
Alexis S. L. Carvalho
change tests to use simplemerge by default
 r4365 hg update
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 --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