{"thread":{"id":"1955","subject":"[PATCH]: cogito testsuite fix - expect \"m foo\", not \"M foo\"","startedAt":"2005-09-27T01:06:01Z","lastAt":"2005-09-27T01:06:01Z","messageCount":1,"participants":["Pavel Roskin"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"9353","messageId":"1127783161.11578.8.camel@dv","threadId":"1955","inReplyTo":null,"subject":"[PATCH]: cogito testsuite fix - expect \"m foo\", not \"M foo\"","fromName":"Pavel Roskin","fromEmail":"proski@gnu.org","sentAt":"2005-09-27T01:06:01Z","receivedAt":"2005-09-27T01:06:01Z","isPatch":true,"sender":{"key":"proski@gnu.org","avatar":null},"body":"Signed-off-by: Pavel Roskin <proski@gnu.org>\n\ntestsuite fix - expect \"m foo\", not \"M foo\"\n\ncommit bb42b67ac543416f974d502e269f134ed80bdd4b introduced status 'm'\nfor modified files that won't be committed.  This change also broke test\n19 in t9202-merge-on-dirty.sh, which expects status 'M'.  I believe the\n'm' status is correct in this test, so it's the testsuite that need to\nbe adjusted.\n\ndiff --git a/t/t9202-merge-on-dirty.sh b/t/t9202-merge-on-dirty.sh\n--- a/t/t9202-merge-on-dirty.sh\n+++ b/t/t9202-merge-on-dirty.sh\n@@ -89,7 +89,7 @@ cp branch1/foo branch1/foo-\n test_expect_failure 'merging branch2 to branch1 (clean)' \\\n \t\t\"(cd branch1 && cg-merge </dev/null)\"\n test_expect_success 'checking if we still have our local change' \\\n-\t\t'(cd branch1 && cg-status -w | grep -q \"^M foo\" && cmp foo foo-)'\n+\t\t'(cd branch1 && cg-status -w | grep -q \"^m foo\" && cmp foo foo-)'\n # This test is useful if the previous one failed - did it get lost or\n # accidentally committed?\n test_expect_success 'checking that we didn'\\''t commit the local change' \\\n\n\n-- \nRegards,\nPavel Roskin\n"}]}