On 25/02/07, Yann Dirson <ydirson@xxxxxxxxxx> wrote:
This testcase demonstrates a long-standing problem with the handling of conflicts on a rewinding branch, when "stg pull" calls git-pull.
[...]
diff --git a/t/t2101-pull-policy-pull.sh b/t/t2101-pull-policy-pull.sh
[...]
+test_expect_failure \ + 'Rewind/rewrite upstream commit and pull it from clone, without --merged' \ + ' + (cd upstream && echo b >> file2 && stg refresh) && + (cd clone && stg pull) + '
This fails (with git 1.5), as expected, but probably not for the same reason. See below.
+test_expect_success \ + 'Undo the conflicted pull' \ + '(cd clone && stg push --undo)'
This actually fails in my tests because the git-pull failed previously (and not the patch pushing) and there is no patch on the stack to undo. BTW, push --undo now requires a status --reset beforehand. I can merge the patch as it is and you can send me another one for this issue. Thanks. -- Catalin - 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