##// END OF EJS Templates
merge with stable
merge with stable

File last commit:

r12156:4c94b6d0 default
r12315:ca58f647 merge default
Show More
test-diffdir.t
40 lines | 623 B | text/troff | Tads3Lexer
Pradeepkumar Gayam
tests: unify test-diffdir
r11921 $ hg init
$ touch a
$ hg add a
Martin Geisler
tests: remove unneeded -d flags...
r12156 $ hg ci -m "a"
Pradeepkumar Gayam
tests: unify test-diffdir
r11921
$ echo 123 > b
$ hg add b
$ hg diff --nodates
Martin Geisler
tests: remove unneeded -d flags...
r12156 diff -r 3903775176ed b
Pradeepkumar Gayam
tests: unify test-diffdir
r11921 --- /dev/null
+++ b/b
@@ -0,0 +1,1 @@
+123
$ hg diff --nodates -r tip
Martin Geisler
tests: remove unneeded -d flags...
r12156 diff -r 3903775176ed b
Pradeepkumar Gayam
tests: unify test-diffdir
r11921 --- /dev/null
+++ b/b
@@ -0,0 +1,1 @@
+123
$ echo foo > a
$ hg diff --nodates
Martin Geisler
tests: remove unneeded -d flags...
r12156 diff -r 3903775176ed a
Pradeepkumar Gayam
tests: unify test-diffdir
r11921 --- a/a
+++ b/a
@@ -0,0 +1,1 @@
+foo
Martin Geisler
tests: remove unneeded -d flags...
r12156 diff -r 3903775176ed b
Pradeepkumar Gayam
tests: unify test-diffdir
r11921 --- /dev/null
+++ b/b
@@ -0,0 +1,1 @@
+123
$ hg diff -r ""
abort: 00changelog.i@: ambiguous identifier!
$ hg diff -r tip -r ""
abort: 00changelog.i@: ambiguous identifier!
$ true