On Tue, Feb 27, 2007 at 02:25:57PM +0000, Catalin Marinas wrote:
> 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.
That would demonstrate the usefulness of a python-based testsuite as I
suggested the other day :)
But I see the test failing with both 1.4.4.4 and 1.5.0.1:
Auto-merged file2
CONFLICT (add/add): Merge conflict in file2
Automatic merge failed; fix conflicts and then commit the result.
stg pull: Failed "git-pull origin"
Traceback (most recent call last):
File "/export/work/yann/git/stgit/t/../stg", line 43, in ?
main()
File "/export/work/yann/git/stgit/stgit/main.py", line 280, in main
command.func(parser, options, args)
File "/export/work/yann/git/stgit/stgit/commands/pull.py", line 84, in func
git.pull(repository)
File "/export/work/yann/git/stgit/stgit/git.py", line 839, in pull
raise GitException, 'Failed "%s %s"' % (command, repository)
stgit.git.GitException: Failed "git-pull origin"
> >+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.
Right, I was a bit confused. I first checked whether there was a
"pull --undo" and did not catch correctly the FlagNotFoundException :)
> BTW, push --undo now requires a status --reset beforehand.
Oh, I had not noticed that. Why so ? It's not like if "push --undo"
would lose any valuable data...
What strikes me most in this case is the difference in behaviour
between this type of conflict (conflict marked in index, so needs an
operation outside the current scope of stgit to proceed), with a
regular stgit conflict that occurs during a push (index clean,
conflict info not available to tools written for regular GIT).
That reminds me I already wondered why stgit has to deal with conflict
handling itself. I've not digged much into the GIT merge mechanism,
but I'd think it would be great if we were able to use it.
> I can merge the patch as it is and you can send me another one for this
> issue.
I have prepared the followin patchlet (you may want to food it into my
previous patch), but I am still a bit unsure what to do - read on.
====================
--- a/t/t2101-pull-policy-pull.sh
+++ b/t/t2101-pull-policy-pull.sh
@@ -47,14 +47,12 @@ test_expect_failure \
'
test_expect_success \
- 'Undo the conflicted pull' \
- '(cd clone && stg push --undo)'
+ '"Solve" the conflict (pretend there is none)' \
+ '(cd clone &&
+ git add file2 && EDITOR=cat git commit)'
test_expect_success \
- 'Pull the rewinded commit, with --merged' \
- '
- (cd clone && stg pull --merged) &&
- test `wc -l <clone/file2` = 2
- '
+ 'Push the stack back' \
+ '(cd clone && stg push -a)'
test_done
====================
The testcase now still ends in a bad situation.
What happenned is our "stg pull" could not complete, so we had to
complete it by hand (instead of attempting to abort it, as my initial
testcase wanted to do). This makes it look like an "unsafe base
change" (since post_rebase was never called to update "orig-base",
after our manual conflict resolution was done), so any subsequent pull
or rebase will require a --force.
I don't like that either. I'm still quite unsure how the "git-pull"
model of pulling ought to work, that obviously does not help :)
Any idea ?
Best regards,
--
Yann.
-
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