Mercurial > hg
view tests/test-diff-hashes.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 | 2065789f6a3e |
| children | c2d0ed7f4af8 |
line wrap: on
line source
quiet: --- a/foo Mon Jan 12 13:46:40 1970 +0000 +++ b/foo Mon Jan 12 13:46:41 1970 +0000 @@ -1,1 +1,1 @@ bar -bar +foobar normal: diff -r 74de3f1392e2 -r b8b5f023a6ad foo --- a/foo Mon Jan 12 13:46:40 1970 +0000 +++ b/foo Mon Jan 12 13:46:41 1970 +0000 @@ -1,1 +1,1 @@ bar -bar +foobar verbose: diff -r 74de3f1392e2 -r b8b5f023a6ad foo --- a/foo Mon Jan 12 13:46:40 1970 +0000 +++ b/foo Mon Jan 12 13:46:41 1970 +0000 @@ -1,1 +1,1 @@ bar -bar +foobar debug: diff -r 74de3f1392e2d67856fb155963441f2610494e1a -r b8b5f023a6ad77fc378bd95cf3fa00cd1414d107 foo --- a/foo Mon Jan 12 13:46:40 1970 +0000 +++ b/foo Mon Jan 12 13:46:41 1970 +0000 @@ -1,1 +1,1 @@ bar -bar +foobar