Mercurial > hg
comparison tests/test-issue660.out @ 5762:c2a21fe60994
"C" status code considered harmful, so changed to "=" (issue899)
C means conflict in other SCMs, and = is more intuitive anyway.
| author | Thomas Arendsen Hein <thomas@intevation.de> |
|---|---|
| date | Sun, 30 Dec 2007 17:45:26 +0100 |
| parents | f252ba975925 |
| children | 8a5d8fb59ed2 |
comparison
equal
deleted
inserted
replaced
| 5761:07df2a5c02b2 | 5762:c2a21fe60994 |
|---|---|
| 30 A a/a | 30 A a/a |
| 31 A b | 31 A b |
| 32 R a | 32 R a |
| 33 R b/b | 33 R b/b |
| 34 % commit | 34 % commit |
| 35 C a/a | 35 = a/a |
| 36 C b | 36 = b |
| 37 % long directory replaced with file | 37 % long directory replaced with file |
| 38 adding d/d/d | 38 adding d/d/d |
| 39 % should fail - would corrupt dirstate | 39 % should fail - would corrupt dirstate |
| 40 abort: directory 'd' already in dirstate | 40 abort: directory 'd' already in dirstate |
| 41 % removing shadow | 41 % removing shadow |
| 42 % should succeed - shadow removed | 42 % should succeed - shadow removed |
| 43 % update should work at least with clean workdir | 43 % update should work at least with clean workdir |
| 44 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | 44 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 45 C a | 45 = a |
| 46 C b/b | 46 = b/b |
| 47 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | 47 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 48 C a/a | 48 = a/a |
| 49 C b | 49 = b |