Mercurial > hg
changeset 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 | 07df2a5c02b2 |
| children | e20de0caf8e7 8a5d8fb59ed2 |
| files | mercurial/commands.py tests/test-586.out tests/test-alias.out tests/test-copy2.out tests/test-help.out tests/test-issue660.out tests/test-merge-prompt.out tests/test-mq-qpush-fail.out tests/test-mq.out tests/test-rebuildstate.out tests/test-rename-merge1.out tests/test-rename-merge2.out tests/test-status.out |
| diffstat | 13 files changed, 32 insertions(+), 32 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/commands.py Sun Dec 30 17:36:49 2007 +0100 +++ b/mercurial/commands.py Sun Dec 30 17:45:26 2007 +0100 @@ -2363,7 +2363,7 @@ M = modified A = added R = removed - C = clean + = = clean ! = deleted, but still tracked ? = not tracked I = ignored (not shown by default) @@ -2388,7 +2388,7 @@ ('unknown', '?', unknown), ('ignored', 'I', ignored)) - explicit_changetypes = changetypes + (('clean', 'C', clean),) + explicit_changetypes = changetypes + (('clean', '=', clean),) end = opts['print0'] and '\0' or '\n'
--- a/tests/test-586.out Sun Dec 30 17:36:49 2007 +0100 +++ b/tests/test-586.out Sun Dec 30 17:45:26 2007 +0100 @@ -10,4 +10,4 @@ (run 'hg heads' to see heads, 'hg merge' to merge) 1 files updated, 0 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit) -C b += b
--- a/tests/test-alias.out Sun Dec 30 17:36:49 2007 +0100 +++ b/tests/test-alias.out Sun Dec 30 17:45:26 2007 +0100 @@ -7,4 +7,4 @@ *** [alias] recursive: circular dependency on recursive adding foo % with opts -C foo += foo
--- a/tests/test-copy2.out Sun Dec 30 17:36:49 2007 +0100 +++ b/tests/test-copy2.out Sun Dec 30 17:45:26 2007 +0100 @@ -12,7 +12,7 @@ bar has not been committed yet, so no copy data will be stored for foo. A foo # dry-run; should show that foo is clean -C foo += foo # should show copy A bar foo @@ -41,7 +41,7 @@ A baz bar # foo was clean: -C foo += foo # but it's considered modified after a copy --after --force M foo bar
--- a/tests/test-help.out Sun Dec 30 17:36:49 2007 +0100 +++ b/tests/test-help.out Sun Dec 30 17:45:26 2007 +0100 @@ -227,7 +227,7 @@ M = modified A = added R = removed - C = clean + = = clean ! = deleted, but still tracked ? = not tracked I = ignored (not shown by default)
--- a/tests/test-issue660.out Sun Dec 30 17:36:49 2007 +0100 +++ b/tests/test-issue660.out Sun Dec 30 17:45:26 2007 +0100 @@ -32,8 +32,8 @@ R a R b/b % commit -C a/a -C b += a/a += b % long directory replaced with file adding d/d/d % should fail - would corrupt dirstate @@ -42,8 +42,8 @@ % should succeed - shadow removed % update should work at least with clean workdir 2 files updated, 0 files merged, 0 files removed, 0 files unresolved -C a -C b/b += a += b/b 2 files updated, 0 files merged, 0 files removed, 0 files unresolved -C a/a -C b += a/a += b
--- a/tests/test-merge-prompt.out Sun Dec 30 17:36:49 2007 +0100 +++ b/tests/test-merge-prompt.out Sun Dec 30 17:45:26 2007 +0100 @@ -7,7 +7,7 @@ (branch merge, don't forget to commit) status: M file2 -C file1 += file1 file1: 1 changed @@ -23,7 +23,7 @@ (branch merge, don't forget to commit) status: file2: No such file or directory -C file1 += file1 file1: 1 changed @@ -57,7 +57,7 @@ failed status: file2: No such file or directory -C file1 += file1 file1: 1 changed
--- a/tests/test-mq-qpush-fail.out Sun Dec 30 17:36:49 2007 +0100 +++ b/tests/test-mq-qpush-fail.out Sun Dec 30 17:45:26 2007 +0100 @@ -16,4 +16,4 @@ % bar should be gone; other unknown/ignored files should still be around ? untracked-file I .hgignore -C foo += foo
--- a/tests/test-mq.out Sun Dec 30 17:36:49 2007 +0100 +++ b/tests/test-mq.out Sun Dec 30 17:45:26 2007 +0100 @@ -369,7 +369,7 @@ +bar 3 barney (foo) % refresh omitting an added file -C newfile += newfile A newfile Now at: bar % create a git patch
--- a/tests/test-rebuildstate.out Sun Dec 30 17:36:49 2007 +0100 +++ b/tests/test-rebuildstate.out Sun Dec 30 17:45:26 2007 +0100 @@ -7,11 +7,11 @@ % status A baz R bar -C foo += foo % state dump n 666 -1 bar n 666 -1 foo % status ! bar ? baz -C foo += foo
--- a/tests/test-rename-merge1.out Sun Dec 30 17:36:49 2007 +0100 +++ b/tests/test-rename-merge1.out Sun Dec 30 17:45:26 2007 +0100 @@ -32,7 +32,7 @@ a M b2 R a -C c2 += c2 blahblah rev offset length base linkrev nodeid p1 p2 0 0 67 0 1 dc51707dfc98 000000000000 000000000000
--- a/tests/test-rename-merge2.out Sun Dec 30 17:36:49 2007 +0100 +++ b/tests/test-rename-merge2.out Sun Dec 30 17:45:26 2007 +0100 @@ -22,7 +22,7 @@ -------------- M b a -C a += a -------------- -------------- @@ -126,7 +126,7 @@ (branch merge, don't forget to commit) -------------- M b -C a += a -------------- -------------- @@ -147,8 +147,8 @@ 0 files updated, 1 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit) -------------- -C a -C b += a += b -------------- -------------- @@ -194,7 +194,7 @@ 0 files updated, 1 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit) -------------- -C b += b -------------- -------------- @@ -244,7 +244,7 @@ (branch merge, don't forget to commit) -------------- M c -C b += b -------------- -------------- @@ -264,7 +264,7 @@ (branch merge, don't forget to commit) -------------- M b -C a += a -------------- -------------- @@ -370,7 +370,7 @@ (branch merge, don't forget to commit) -------------- M b -C a += a -------------- -------------- @@ -412,7 +412,7 @@ (branch merge, don't forget to commit) -------------- M b -C a += a -------------- --------------