Mercurial > hg
view tests/test-mq-qrefresh.out @ 5279:2dbd750b3ddd
convert: clear the dirstate before a conversion, invalidate it afterwards
Clearing it before the conversion protects us from whatever data were
there (file copies in particular).
Invalidating it after the conversion avoids writing a possibly
inconsistent dirstate to disk.
| author | Alexis S. L. Carvalho <alexis@cecm.usp.br> |
|---|---|
| date | Sat, 01 Sep 2007 02:49:18 -0300 |
| parents | f01efb4bc258 |
| children | 3d1f9dcecdea |
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 -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