branch | stable |
changeset 12795 | 3cb0559e44d0 |
parent 12793 | 469850088fc1 |
parent 12794 | 6bf8d48bec8e |
child 12796 | bc69ba99e34b |
12793:469850088fc1 | 12795:3cb0559e44d0 |
---|---|
1 % test file addition with bad case |
|
2 adding a |
|
3 A a |
|
4 a |
|
5 % test case collision on rename (issue 750) |
|
6 adding a |
|
7 a |
|
8 committed changeset 0:07f4944404050f47db2e5c5071e0e84e7a27bba9 |
|
9 A: not overwriting - file exists |
|
10 % test case collision between revisions (issue 912) |
|
11 adding a |
|
12 adding A |
|
13 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
14 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |