Mercurial > hg > mercurial-crew-with-dirclash
diff tests/test-mq-qrefresh.out @ 3129:f01efb4bc258
tests: add new test; test-mq-qrefresh
| author | Giorgos Keramidas <keramida@ceid.upatras.gr> |
|---|---|
| date | Wed, 20 Sep 2006 21:44:35 +0200 |
| parents | |
| children |
line wrap: on
line diff
new file mode 100644 --- /dev/null +++ b/tests/test-mq-qrefresh.out @@ -0,0 +1,161 @@ +% init +% commit +adding 1/base +adding 2/base +% qnew mqbase +% qrefresh +% qdiff +diff -r b55ecdccb5cf 1/base +--- a/1/base ++++ b/1/base +@@ -1,1 +1,1 @@ base +-base ++patched +diff -r b55ecdccb5cf 2/base +--- a/2/base ++++ b/2/base +@@ -1,1 +1,1 @@ base +-base ++patched +% qdiff dirname +diff -r b55ecdccb5cf 1/base +--- a/1/base ++++ b/1/base +@@ -1,1 +1,1 @@ base +-base ++patched +diff -r b55ecdccb5cf 2/base +--- a/2/base ++++ b/2/base +@@ -1,1 +1,1 @@ base +-base ++patched +% patch file contents +mqbase + +diff -r b55ecdccb5cf 1/base +--- a/1/base ++++ b/1/base +@@ -1,1 +1,1 @@ base +-base ++patched +diff -r b55ecdccb5cf 2/base +--- a/2/base ++++ b/2/base +@@ -1,1 +1,1 @@ base +-base ++patched +% qrefresh 1 +% qdiff +diff -r b55ecdccb5cf 1/base +--- a/1/base ++++ b/1/base +@@ -1,1 +1,1 @@ base +-base ++patched +diff -r b55ecdccb5cf 2/base +--- a/2/base ++++ b/2/base +@@ -1,1 +1,1 @@ base +-base ++patched +% qdiff dirname +diff -r b55ecdccb5cf 1/base +--- a/1/base ++++ b/1/base +@@ -1,1 +1,1 @@ base +-base ++patched +diff -r b55ecdccb5cf 2/base +--- a/2/base ++++ b/2/base +@@ -1,1 +1,1 @@ base +-base ++patched +% patch file contents +mqbase + +diff -r b55ecdccb5cf 1/base +--- a/1/base ++++ b/1/base +@@ -1,1 +1,1 @@ base +-base ++patched +% qrefresh . in subdir +% qdiff +diff -r b55ecdccb5cf 1/base +--- a/1/base ++++ b/1/base +@@ -1,1 +1,1 @@ base +-base ++patched +diff -r b55ecdccb5cf 2/base +--- a/2/base ++++ b/2/base +@@ -1,1 +1,1 @@ base +-base ++patched +% qdiff dirname +diff -r b55ecdccb5cf 1/base +--- a/1/base ++++ b/1/base +@@ -1,1 +1,1 @@ base +-base ++patched +diff -r b55ecdccb5cf 2/base +--- a/2/base ++++ b/2/base +@@ -1,1 +1,1 @@ base +-base ++patched +% patch file contents +mqbase + +diff -r b55ecdccb5cf 1/base +--- a/1/base ++++ b/1/base +@@ -1,1 +1,1 @@ base +-base ++patched +% qrefresh in hg-root again +% qdiff +diff -r b55ecdccb5cf 1/base +--- a/1/base ++++ b/1/base +@@ -1,1 +1,1 @@ base +-base ++patched +diff -r b55ecdccb5cf 2/base +--- a/2/base ++++ b/2/base +@@ -1,1 +1,1 @@ base +-base ++patched +% qdiff dirname +diff -r b55ecdccb5cf 1/base +--- a/1/base ++++ b/1/base +@@ -1,1 +1,1 @@ base +-base ++patched +diff -r b55ecdccb5cf 2/base +--- a/2/base ++++ b/2/base +@@ -1,1 +1,1 @@ base +-base ++patched +% patch file contents +mqbase + +diff -r b55ecdccb5cf 1/base +--- a/1/base ++++ b/1/base +@@ -1,1 +1,1 @@ base +-base ++patched +diff -r b55ecdccb5cf 2/base +--- a/2/base ++++ b/2/base +@@ -1,1 +1,1 @@ base +-base ++patched