Mercurial > hg
comparison tests/test-copy2.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 | fc8b3e7cbf6b |
| children | 8a5d8fb59ed2 |
comparison
equal
deleted
inserted
replaced
| 5761:07df2a5c02b2 | 5762:c2a21fe60994 |
|---|---|
| 10 A bar | 10 A bar |
| 11 # should print a warning that this is not a real copy; foo is added | 11 # should print a warning that this is not a real copy; foo is added |
| 12 bar has not been committed yet, so no copy data will be stored for foo. | 12 bar has not been committed yet, so no copy data will be stored for foo. |
| 13 A foo | 13 A foo |
| 14 # dry-run; should show that foo is clean | 14 # dry-run; should show that foo is clean |
| 15 C foo | 15 = foo |
| 16 # should show copy | 16 # should show copy |
| 17 A bar | 17 A bar |
| 18 foo | 18 foo |
| 19 # shouldn't show copy | 19 # shouldn't show copy |
| 20 # should match | 20 # should match |
| 39 # should show no copies | 39 # should show no copies |
| 40 # copy --after on an added file | 40 # copy --after on an added file |
| 41 A baz | 41 A baz |
| 42 bar | 42 bar |
| 43 # foo was clean: | 43 # foo was clean: |
| 44 C foo | 44 = foo |
| 45 # but it's considered modified after a copy --after --force | 45 # but it's considered modified after a copy --after --force |
| 46 M foo | 46 M foo |
| 47 bar | 47 bar |