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

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

debugcommands: add debugpickmergetool to examine which merge tool is chosen...
debugcommands: add debugpickmergetool to examine which merge tool is chosen Before this patch, there is no convenient way to know which merge tool is chosen for each managed files without actual merging.
Sean Farley - - Load All Authors

File last commit:

r24455:16961d43 default
r32256:9bc36198 default
Show More
test-diff-subdir.t
67 lines | 943 B | text/troff | Tads3Lexer
/ tests / test-diff-subdir.t
History | Source | Raw |Copy content |Copy permalink
Adrian Buehlmann
tests: unify test-diff-subdir
 r12140 $ hg init
$ mkdir alpha
$ touch alpha/one
$ mkdir beta
$ touch beta/two
$ hg add alpha/one beta/two
$ hg ci -m "start"
$ echo 1 > alpha/one
$ echo 2 > beta/two
everything
$ hg diff --nodates
diff -r 7d5ef1aea329 alpha/one
--- a/alpha/one
+++ b/alpha/one
@@ -0,0 +1,1 @@
+1
diff -r 7d5ef1aea329 beta/two
--- a/beta/two
+++ b/beta/two
@@ -0,0 +1,1 @@
+2
beta only
$ hg diff --nodates beta
diff -r 7d5ef1aea329 beta/two
--- a/beta/two
+++ b/beta/two
@@ -0,0 +1,1 @@
+2
inside beta
$ cd beta
$ hg diff --nodates .
diff -r 7d5ef1aea329 beta/two
--- a/beta/two
+++ b/beta/two
@@ -0,0 +1,1 @@
+2
Siddharth Agarwal
commands.diff: add support for diffs relative to a subdirectory...
 r24432 relative to beta
Mads Kiilerich
tests: add missing trailing 'cd ..'...
 r16913 $ cd ..
Sean Farley
diff: rename --relative option to --root...
 r24455 $ hg diff --nodates --root beta
Siddharth Agarwal
commands.diff: add support for diffs relative to a subdirectory...
 r24432 diff -r 7d5ef1aea329 two
--- a/two
+++ b/two
@@ -0,0 +1,1 @@
+2
inside beta
$ cd beta
Sean Farley
diff: rename --relative option to --root...
 r24455 $ hg diff --nodates --root .
Siddharth Agarwal
commands.diff: add support for diffs relative to a subdirectory...
 r24432 diff -r 7d5ef1aea329 two
--- a/two
+++ b/two
@@ -0,0 +1,1 @@
+2
$ cd ..