Mercurial > hg
view tests/test-mq-qrefresh.out @ 6543:a6e2e60b34d0
convert: handle past or foreign partial svn copies
Subversion allows revisions to be composed of subparts coming from revisions
before the parent or from other part of the repository. There is no simple
representation for these now, keep the changes but do not track their origins.
| author | Patrick Mezard <pmezard@gmail.com> |
|---|---|
| date | Mon, 14 Apr 2008 22:31:34 +0200 |
| parents | 3d1f9dcecdea |
| children | 71e339714586 |
line wrap: on
line source
% 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 +patched diff -r b55ecdccb5cf 2/base --- a/2/base +++ b/2/base @@ -1,1 +1,1 @@ -base +patched % qdiff dirname diff -r b55ecdccb5cf 1/base --- a/1/base +++ b/1/base @@ -1,1 +1,1 @@ -base +patched diff -r b55ecdccb5cf 2/base --- a/2/base +++ b/2/base @@ -1,1 +1,1 @@ -base +patched % patch file contents mqbase diff -r b55ecdccb5cf 1/base --- a/1/base +++ b/1/base @@ -1,1 +1,1 @@ -base +patched diff -r b55ecdccb5cf 2/base --- a/2/base +++ b/2/base @@ -1,1 +1,1 @@ -base +patched % qrefresh 1 % qdiff diff -r b55ecdccb5cf 1/base --- a/1/base +++ b/1/base @@ -1,1 +1,1 @@ -base +patched diff -r b55ecdccb5cf 2/base --- a/2/base +++ b/2/base @@ -1,1 +1,1 @@ -base +patched % qdiff dirname diff -r b55ecdccb5cf 1/base --- a/1/base +++ b/1/base @@ -1,1 +1,1 @@ -base +patched diff -r b55ecdccb5cf 2/base --- a/2/base +++ b/2/base @@ -1,1 +1,1 @@ -base +patched % patch file contents mqbase diff -r b55ecdccb5cf 1/base --- a/1/base +++ b/1/base @@ -1,1 +1,1 @@ -base +patched % qrefresh . in subdir % qdiff diff -r b55ecdccb5cf 1/base --- a/1/base +++ b/1/base @@ -1,1 +1,1 @@ -base +patched diff -r b55ecdccb5cf 2/base --- a/2/base +++ b/2/base @@ -1,1 +1,1 @@ -base +patched % qdiff dirname diff -r b55ecdccb5cf 1/base --- a/1/base +++ b/1/base @@ -1,1 +1,1 @@ -base +patched diff -r b55ecdccb5cf 2/base --- a/2/base +++ b/2/base @@ -1,1 +1,1 @@ -base +patched % patch file contents mqbase diff -r b55ecdccb5cf 1/base --- a/1/base +++ b/1/base @@ -1,1 +1,1 @@ -base +patched % qrefresh in hg-root again % qdiff diff -r b55ecdccb5cf 1/base --- a/1/base +++ b/1/base @@ -1,1 +1,1 @@ -base +patched diff -r b55ecdccb5cf 2/base --- a/2/base +++ b/2/base @@ -1,1 +1,1 @@ -base +patched % qdiff dirname diff -r b55ecdccb5cf 1/base --- a/1/base +++ b/1/base @@ -1,1 +1,1 @@ -base +patched diff -r b55ecdccb5cf 2/base --- a/2/base +++ b/2/base @@ -1,1 +1,1 @@ -base +patched % patch file contents mqbase diff -r b55ecdccb5cf 1/base --- a/1/base +++ b/1/base @@ -1,1 +1,1 @@ -base +patched diff -r b55ecdccb5cf 2/base --- a/2/base +++ b/2/base @@ -1,1 +1,1 @@ -base +patched