This demonstrates an issue wite has bitten me more than once: the stg branch adds a file in one patch, and modifies it in a later patch; then all patches get integrated in upstream tree, and at "stg pull" time, stgit believes there is a conflict, even one the patches are exactly the same. "stg push" apparently does not consider patches one by one, or it would have noticed that the patches were "already applied". It reports: Pushing patch "p1"...Error: File "file2" added in branches but different The merge failed during "push". Use "refresh" after fixing the conflicts stg push: GIT index merging failed (possible conflicts) Signed-off-by: Yann Dirson <ydirson@xxxxxxxxxx> --- t/t1200-push-modified.sh | 51 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 51 insertions(+), 0 deletions(-) diff --git a/t/t1200-push-modified.sh b/t/t1200-push-modified.sh new file mode 100755 index 0000000..18a4df2 --- /dev/null +++ b/t/t1200-push-modified.sh @@ -0,0 +1,51 @@ +#!/bin/sh +# +# Copyright (c) 2006 Yann Dirson +# + +test_description='Exercise pushing patches applied upstream. + +Especially, consider the case of a patch that adds a file, +while a subsequent one modifies it. +' + +. ./test-lib.sh + +# don't need this repo, but better not drop it, see t1100 +#rm -rf .git + +# Need a repo to clone +test_create_repo foo + +test_expect_success \ + 'Clone tree and setup changes' \ + "stg clone foo bar && + (cd bar && stg new p1 -m p1 + printf 'a\nc\n' > file && stg add file && stg refresh && + stg new p2 -m p2 + printf 'a\nb\nc\n' > file && stg refresh + ) +" + +test_expect_success \ + 'Port those patches to orig tree' \ + "(cd foo && + GIT_DIR=../bar/.git git-format-patch --stdout bases/master..HEAD | + git-am -3 -k + ) +" + +test_expect_success \ + 'Pull to sync with parent, preparing for the problem' \ + "(cd bar && stg pop --all && + stg pull + ) +" + +test_expect_success \ + 'Now attempt to push those patches applied upstream' \ + "(cd bar && stg push --all + ) +" + +test_done - : 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