test-mq-qrefresh.out
161 lines
| 2.2 KiB
| text/plain
|
TextLexer
/ tests / test-mq-qrefresh.out
|
r3136 | % init | ||
% commit | ||||
adding 1/base | ||||
adding 2/base | ||||
% qnew mqbase | ||||
% qrefresh | ||||
% qdiff | ||||
diff -r b55ecdccb5cf 1/base | ||||
--- a/1/base | ||||
+++ b/1/base | ||||
|
r5863 | @@ -1,1 +1,1 @@ | ||
|
r3136 | -base | ||
+patched | ||||
diff -r b55ecdccb5cf 2/base | ||||
--- a/2/base | ||||
+++ b/2/base | ||||
|
r5863 | @@ -1,1 +1,1 @@ | ||
|
r3136 | -base | ||
+patched | ||||
% qdiff dirname | ||||
diff -r b55ecdccb5cf 1/base | ||||
--- a/1/base | ||||
+++ b/1/base | ||||
|
r5863 | @@ -1,1 +1,1 @@ | ||
|
r3136 | -base | ||
+patched | ||||
diff -r b55ecdccb5cf 2/base | ||||
--- a/2/base | ||||
+++ b/2/base | ||||
|
r5863 | @@ -1,1 +1,1 @@ | ||
|
r3136 | -base | ||
+patched | ||||
% patch file contents | ||||
mqbase | ||||
diff -r b55ecdccb5cf 1/base | ||||
--- a/1/base | ||||
+++ b/1/base | ||||
|
r5863 | @@ -1,1 +1,1 @@ | ||
|
r3136 | -base | ||
+patched | ||||
diff -r b55ecdccb5cf 2/base | ||||
--- a/2/base | ||||
+++ b/2/base | ||||
|
r5863 | @@ -1,1 +1,1 @@ | ||
|
r3136 | -base | ||
+patched | ||||
% qrefresh 1 | ||||
% qdiff | ||||
diff -r b55ecdccb5cf 1/base | ||||
--- a/1/base | ||||
+++ b/1/base | ||||
|
r5863 | @@ -1,1 +1,1 @@ | ||
|
r3136 | -base | ||
+patched | ||||
diff -r b55ecdccb5cf 2/base | ||||
--- a/2/base | ||||
+++ b/2/base | ||||
|
r5863 | @@ -1,1 +1,1 @@ | ||
|
r3136 | -base | ||
+patched | ||||
% qdiff dirname | ||||
diff -r b55ecdccb5cf 1/base | ||||
--- a/1/base | ||||
+++ b/1/base | ||||
|
r5863 | @@ -1,1 +1,1 @@ | ||
|
r3136 | -base | ||
+patched | ||||
diff -r b55ecdccb5cf 2/base | ||||
--- a/2/base | ||||
+++ b/2/base | ||||
|
r5863 | @@ -1,1 +1,1 @@ | ||
|
r3136 | -base | ||
+patched | ||||
% patch file contents | ||||
mqbase | ||||
diff -r b55ecdccb5cf 1/base | ||||
--- a/1/base | ||||
+++ b/1/base | ||||
|
r5863 | @@ -1,1 +1,1 @@ | ||
|
r3136 | -base | ||
+patched | ||||
% qrefresh . in subdir | ||||
% qdiff | ||||
diff -r b55ecdccb5cf 1/base | ||||
--- a/1/base | ||||
+++ b/1/base | ||||
|
r5863 | @@ -1,1 +1,1 @@ | ||
|
r3136 | -base | ||
+patched | ||||
diff -r b55ecdccb5cf 2/base | ||||
--- a/2/base | ||||
+++ b/2/base | ||||
|
r5863 | @@ -1,1 +1,1 @@ | ||
|
r3136 | -base | ||
+patched | ||||
% qdiff dirname | ||||
diff -r b55ecdccb5cf 1/base | ||||
--- a/1/base | ||||
+++ b/1/base | ||||
|
r5863 | @@ -1,1 +1,1 @@ | ||
|
r3136 | -base | ||
+patched | ||||
diff -r b55ecdccb5cf 2/base | ||||
--- a/2/base | ||||
+++ b/2/base | ||||
|
r5863 | @@ -1,1 +1,1 @@ | ||
|
r3136 | -base | ||
+patched | ||||
% patch file contents | ||||
mqbase | ||||
diff -r b55ecdccb5cf 1/base | ||||
--- a/1/base | ||||
+++ b/1/base | ||||
|
r5863 | @@ -1,1 +1,1 @@ | ||
|
r3136 | -base | ||
+patched | ||||
% qrefresh in hg-root again | ||||
% qdiff | ||||
diff -r b55ecdccb5cf 1/base | ||||
--- a/1/base | ||||
+++ b/1/base | ||||
|
r5863 | @@ -1,1 +1,1 @@ | ||
|
r3136 | -base | ||
+patched | ||||
diff -r b55ecdccb5cf 2/base | ||||
--- a/2/base | ||||
+++ b/2/base | ||||
|
r5863 | @@ -1,1 +1,1 @@ | ||
|
r3136 | -base | ||
+patched | ||||
% qdiff dirname | ||||
diff -r b55ecdccb5cf 1/base | ||||
--- a/1/base | ||||
+++ b/1/base | ||||
|
r5863 | @@ -1,1 +1,1 @@ | ||
|
r3136 | -base | ||
+patched | ||||
diff -r b55ecdccb5cf 2/base | ||||
--- a/2/base | ||||
+++ b/2/base | ||||
|
r5863 | @@ -1,1 +1,1 @@ | ||
|
r3136 | -base | ||
+patched | ||||
% patch file contents | ||||
mqbase | ||||
diff -r b55ecdccb5cf 1/base | ||||
--- a/1/base | ||||
+++ b/1/base | ||||
|
r5863 | @@ -1,1 +1,1 @@ | ||
|
r3136 | -base | ||
+patched | ||||
diff -r b55ecdccb5cf 2/base | ||||
--- a/2/base | ||||
+++ b/2/base | ||||
|
r5863 | @@ -1,1 +1,1 @@ | ||
|
r3136 | -base | ||
+patched | ||||