I tried to build git release 1.4.2 and it failed with the following tests:
*** t3403-rebase-skip.sh ***
* ok 1: setup
* ok 2: rebase with git am -3 (default)
* FAIL 3: rebase --skip with am -3
git reset --hard HEAD &&
git rebase --skip
* ok 4: checkout skip-merge
* ok 5: rebase with --merge
* ok 6: rebase --skip with --merge
* FAIL 7: merge and reference trees equal
test -z "`git-diff-tree skip-merge skip-reference`"
* failed 2 among 7 test(s)
I enabled the --verbose and --debug test options in the test script
makefile and then got this:
* ok 2: rebase with git am -3 (default)
* expecting success:
git reset --hard HEAD &&
git rebase --skip
previous dotest directory .dotest still exists but mbox given.
* FAIL 3: rebase --skip with am -3
git reset --hard HEAD &&
git rebase --skip
* expecting success: git checkout -f skip-merge
* ok 4: checkout skip-merge
* expecting failure: git rebase --merge master
Merging HEAD with aa79649ca1fa23815a1ad3e336d9f860599556a3
Merging:
7cb7464379042fecc2968751bd55656a97d28c77 goodbye
aa79649ca1fa23815a1ad3e336d9f860599556a3 we should skip this
found 1 common ancestor(s):
b0ab61719ccd2e08f34e326172362a485540934e hello
Auto-merging hello
CONFLICT (content): Merge conflict in hello
When you have resolved this problem run "git rebase --continue".
If you would prefer to skip this patch, instead run "git rebase --skip".
To restore the original branch and stop rebasing run "git rebase
--abort".
* ok 5: rebase with --merge
* expecting success:
git reset --hard HEAD &&
git rebase --skip
Merging HEAD with 46a6fc9814012b86849bc8fc8ae2d5cc1958c3cb
Merging:
7cb7464379042fecc2968751bd55656a97d28c77 goodbye
46a6fc9814012b86849bc8fc8ae2d5cc1958c3cb this should not be skipped
found 1 common ancestor(s):
aa79649ca1fa23815a1ad3e336d9f860599556a3 we should skip this
Committed: 0002 this should not be skipped
All done.
* ok 6: rebase --skip with --merge
* expecting success: test -z "`git-diff-tree skip-merge skip-reference`"
* FAIL 7: merge and reference trees equal
test -z "`git-diff-tree skip-merge skip-reference`"
/tmp/buildd/git-core-1.4.2/t/../gitk: line 3: exec: wish: not found
* failed 2 among 7 test(s)
Does anyone know what this means? I am building on Ubuntu Dapper Drake.
Please CC replies.
-
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