view tests/test-mq-qdiff.out @ 10198:c2168d170f05

test-subrepo-svn: normalize OS specific path separator

% init
% commit
adding base
% qnew mqbase
% qrefresh
% qdiff
diff -r 67e992f2c4f3 base
--- a/base
+++ b/base
@@ -1,1 +1,1 @@
-base
+patched
% qdiff dirname
diff -r 67e992f2c4f3 base
--- a/base
+++ b/base
@@ -1,1 +1,1 @@
-base
+patched
% qdiff filename
diff -r 67e992f2c4f3 base
--- a/base
+++ b/base
@@ -1,1 +1,1 @@
-base
+patched
% revert
% qpop
popping mqbase
patch queue now empty
% 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
+     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
% qdiff --reverse
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
% qdiff preserve existing git flag
diff --git a/lines b/lines
--- a/lines
+++ b/lines
@@ -1,9 +1,12 @@
+
+
 1
 2
 3
 4
-hello world
-goodbye world
+hello  world
+     goodbye world
 7
 8
 9
+a