##// END OF EJS Templates
Added tag 4.1.3 for changeset 77eaf9539499
Added tag 4.1.3 for changeset 77eaf9539499

File last commit:

r27902:51b6ce25 default
r32051:962f7cfb stable
Show More
test-diffdir.t
77 lines | 1.5 KiB | 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 ""
Matt Mackall
revsets: make revpair revsets-aware...
r12617 hg: parse error: empty query
Matt Mackall
tests: add exit codes to unified tests
r12316 [255]
Pradeepkumar Gayam
tests: unify test-diffdir
r11921 $ hg diff -r tip -r ""
Matt Mackall
revsets: make revpair revsets-aware...
r12617 hg: parse error: empty query
Matt Mackall
tests: add exit codes to unified tests
r12316 [255]
Martin von Zweigbergk
diff: don't crash when merged-in addition was removed (issue4786)...
r27901
Remove a file that was added via merge. Since the file is not in parent 1,
it should not be in the diff.
$ hg ci -m 'a=foo' a
$ hg co -Cq null
$ echo 123 > b
$ hg add b
$ hg ci -m "b"
created new head
$ hg merge 1
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
$ hg rm -f a
$ hg diff --nodates
Rename a file that was added via merge. Since the rename source is not in
parent 1, the diff should be relative to /dev/null
$ hg co -Cq 2
$ hg merge 1
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
$ hg mv a a2
$ hg diff --nodates
diff -r cf44b38435e5 a2
--- /dev/null
+++ b/a2
@@ -0,0 +1,1 @@
+foo
Martin von Zweigbergk
diff: don't crash when merged-in addition is copied...
r27902 $ hg diff --nodates --git
diff --git a/a2 b/a2
new file mode 100644
--- /dev/null
+++ b/a2
@@ -0,0 +1,1 @@
+foo