Mercurial > hg
comparison tests/test-issue660.out @ 5764:8a5d8fb59ed2
Backed out changeset c2a21fe60994
Unfortunately, this breaks backward compatibility.
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Mon, 31 Dec 2007 17:47:02 -0600 |
parents | c2a21fe60994 |
children |
comparison
equal
deleted
inserted
replaced
5762:c2a21fe60994 | 5764:8a5d8fb59ed2 |
---|---|
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 = a/a | 35 C a/a |
36 = b | 36 C 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 = a | 45 C a |
46 = b/b | 46 C 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 = a/a | 48 C a/a |
49 = b | 49 C b |