From: David KÃ¥gedal <davidk@xxxxxxxxxxxxxx> Signed-off-by: David KÃ¥gedal <davidk@xxxxxxxxxxxxxx> --- t/t1203-push-conflict.sh | 64 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 64 insertions(+), 0 deletions(-) diff --git a/t/t1203-push-conflict.sh b/t/t1203-push-conflict.sh new file mode 100755 index 0000000..57fb477 --- /dev/null +++ b/t/t1203-push-conflict.sh @@ -0,0 +1,64 @@ +#!/bin/sh +# +# Copyright (c) 2006 David KÃ¥gedal +# + +test_description='Exercise push conflicts. + +Test that the index has no modifications after a push with conflicts. +' + +. ./test-lib.sh + +test_expect_success \ + 'Initialize the StGIT repository' \ + 'stg init +' + +test_expect_success \ + 'Create the first patch' \ + ' + stg new foo -m foo && + echo foo > test && + echo fie > test2 && + stg add test test2 && + stg refresh && + stg pop + ' + +test_expect_success \ + 'Create the second patch' \ + ' + stg new bar -m bar && + echo bar > test && + stg add test && + stg refresh + ' + +test_expect_failure \ + 'Push the first patch with conflict' \ + ' + stg push foo + ' + +test_expect_failure \ + 'Show the, now empty, first patch' \ + ' + stg show foo | grep -q -e "^diff " + ' + +test_expect_success \ + 'Check that the index has the non-conflict updates' \ + ' + git diff --cached --stat | grep -q -e "^ test2 | *1 " + ' + +test_expect_success \ + 'Resolve the conflict' \ + ' + echo resolved > test && + git add test && + stg refresh + ' + +test_done -- 1.5.3.rc3.119.g1812 - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
