Mercurial > hg
view tests/test-diff-hashes.out @ 5920:5df7cb799baf
CVS convert: Find correct parent for new branch (issue704)
Previously the parent was determined by the last changeset where the branched
file was changed even if the branch is based on an earlier revision.
Fix written by mpm.
| author | Thomas Arendsen Hein <thomas@intevation.de> |
|---|---|
| date | Tue, 22 Jan 2008 00:16:50 +0100 |
| 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