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

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

patchbomb: fix 'echo -en' bashism in test-patchbomb...
patchbomb: fix 'echo -en' bashism in test-patchbomb The echo command doesn't accept options in some shells. printf is required by the SUSv2 (Single UNIX Specification v2).
Yannick Gingras - - Load All Authors

File last commit:

r9725:3f522d2f default
r9730:732fc0e9 default
Show More
test-mq-qdiff.out
106 lines | 1.2 KiB | text/plain | TextLexer
/ tests / test-mq-qdiff.out
History | Source | Raw |Copy content |Copy permalink
Giorgos Keramidas
tests: new test for mq qdiff command...
 r2916 % init
% commit
adding base
% qnew mqbase
% qrefresh
% qdiff
diff -r 67e992f2c4f3 base
--- a/base
+++ b/base
Matt Mackall
diff: don't show function name by default...
 r5863 @@ -1,1 +1,1 @@
Giorgos Keramidas
tests: new test for mq qdiff command...
 r2916 -base
+patched
% qdiff dirname
diff -r 67e992f2c4f3 base
--- a/base
+++ b/base
Matt Mackall
diff: don't show function name by default...
 r5863 @@ -1,1 +1,1 @@
Giorgos Keramidas
tests: new test for mq qdiff command...
 r2916 -base
+patched
Jason Orendorff
mq: qdiff: support all diffopts
 r6668 % qdiff filename
diff -r 67e992f2c4f3 base
--- a/base
+++ b/base
@@ -1,1 +1,1 @@
-base
+patched
% revert
% qpop
Mads Kiilerich
mq: qpop now tells which patches are popped...
 r9110 popping mqbase
Martin Geisler
mq: lowercase output...
 r7627 patch queue now empty
Jason Orendorff
mq: qdiff: support all diffopts
 r6668 % qdelete mqbase
% commit 2
adding lines
% qnew 2
% qdiff -U 1
diff -r 35fb829491c1 lines
--- a/lines
+++ b/lines
@@ -1,1 +1,3 @@
+
+
1
@@ -4,4 +6,4 @@
4
-hello world
-goodbye world
+hello world
+ goodbye world
7
% qdiff -b
diff -r 35fb829491c1 lines
--- a/lines
+++ b/lines
@@ -1,9 +1,11 @@
+
+
1
2
3
4
-hello world
-goodbye world
+hello world
+ goodbye world
7
8
9
% qdiff -U 1 -B
diff -r 35fb829491c1 lines
--- a/lines
+++ b/lines
@@ -4,4 +6,4 @@
4
-hello world
-goodbye world
+hello world
+ goodbye world
7
Yannick Gingras
diff: add --inverse option...
 r9725 % qdiff -w
Jason Orendorff
mq: qdiff: support all diffopts
 r6668 diff -r 35fb829491c1 lines
--- a/lines
+++ b/lines
@@ -1,3 +1,5 @@
+
+
1
2
3
Yannick Gingras
diff: add --inverse option...
 r9725 % qdiff --inverse
diff -r 35fb829491c1 lines
--- a/lines
+++ b/lines
@@ -1,11 +1,9 @@
-
-
1
2
3
4
-hello world
- goodbye world
+hello world
+goodbye world
7
8
9