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

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

status: add support for log-like template keywords and functions...
status: add support for log-like template keywords and functions It's bound to ctx2 since "hg status" can be considered to show the status of the files at ctx2 given ctx1 as the base.
Pulkit Goyal - - Load All Authors

File last commit:

r38488:9ef9884e default
r38563:85e3aa21 @67 default
Show More
test-diff-antipatience.t
91 lines | 1.1 KiB | text/troff | Tads3Lexer
/ tests / test-diff-antipatience.t
History | Source | Raw |Copy content |Copy permalink
Jun Wu
tests: add tests about diff quality...
 r36696 #testcases bdiff xdiff
#if xdiff
#require xdiff
$ cat >> $HGRCPATH <<EOF
> [experimental]
> xdiff = true
> EOF
#endif
Test case that makes use of the weakness of patience diff algorithm
$ hg init
Pulkit Goyal
py3: make tests/test-diff-antipatience.t work with python 3...
 r38488 >>> open('a', 'wb').write(('\n'.join(list('a' + 'x' * 10 + 'u' + 'x' * 30 + 'a\n'))).encode('ascii')) and None
Jun Wu
tests: add tests about diff quality...
 r36696 $ hg commit -m 1 -A a
Pulkit Goyal
py3: make tests/test-diff-antipatience.t work with python 3...
 r38488 >>> open('a', 'wb').write(('\n'.join(list('b' + 'x' * 30 + 'u' + 'x' * 10 + 'b\n'))).encode('ascii')) and None
Jun Wu
tests: add tests about diff quality...
 r36696 #if xdiff
$ hg diff
diff -r f0aeecb49805 a
--- a/a Thu Jan 01 00:00:00 1970 +0000
+++ b/a Thu Jan 01 00:00:00 1970 +0000
@@ -1,4 +1,4 @@
-a
+b
x
x
x
@@ -9,7 +9,6 @@
x
x
x
-u
x
x
x
@@ -30,6 +29,7 @@
x
x
x
+u
x
x
x
@@ -40,5 +40,5 @@
x
x
x
-a
+b
#else
$ hg diff
diff -r f0aeecb49805 a
--- a/a Thu Jan 01 00:00:00 1970 +0000
+++ b/a Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +1,4 @@
-a
-x
-x
-x
-x
-x
-x
-x
-x
-x
-x
-u
+b
x
x
x
@@ -40,5 +29,16 @@
x
x
x
-a
+u
+x
+x
+x
+x
+x
+x
+x
+x
+x
+x
+b
#endif