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

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

issue1577: fix broken test by assuming less about CVS output....
issue1577: fix broken test by assuming less about CVS output. Specifically, output of "cvs ci" varies unpredictably across CVS versions, so any test that includes the output of "cvs ci" is doomed to fail some of the time. This fixes that by discarding the output of "cvs ci".
Martin Geisler - - Load All Authors

File last commit:

r7627:fb32ae9c default
r8081:6c3b8132 default
Show More
test-mq-qdiff.out
87 lines | 996 B | 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
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
qdiff -w
diff -r 35fb829491c1 lines
--- a/lines
+++ b/lines
@@ -1,3 +1,5 @@
+
+
1
2
3