Hi all,
I just tried to do a git bisect in my clone of the u-boot git repo to trace some commits in the past, but I noticed there is a problem doing a rebase in an unchanged fresh clone of git.denx.de/u-boot.git. Thats what I did:
~$ git --version git version 1.5.6.5
~$ git clone git://git.denx.de/u-boot.git Initialized empty Git repository in /home/pvollmer/u-boot/.git/ remote: Counting objects: 80730, done. remote: Compressing objects: 100% (16904/16904), done. remote: Total 80730 (delta 66116), reused 77805 (delta 63347) Receiving objects: 100% (80730/80730), 26.96 MiB | 5812 KiB/s, done. Resolving deltas: 100% (66116/66116), done.
~/uboot$ git rebase v1.3.3 First, rewinding head to replay your work on top of it... Applying ppc4xx: Add the Harris QUAD100HD AMCC 405EP-based board Applying Fix @ -> <at> substitution error: patch failed: board/atmel/at91cap9adk/Makefile:1 error: board/atmel/at91cap9adk/Makefile: patch does not apply error: patch failed: board/atmel/at91cap9adk/at91cap9adk.c:1 error: board/atmel/at91cap9adk/at91cap9adk.c: patch does not apply error: patch failed: board/atmel/at91cap9adk/led.c:1 error: board/atmel/at91cap9adk/led.c: patch does not apply <snip> ... lots of errors <\snip> Applying Socrates: Added USB support. error: patch failed: include/configs/socrates.h:236 error: include/configs/socrates.h: patch does not apply Using index info to reconstruct a base tree... Falling back to patching base and 3-way merge... Auto-merged include/configs/socrates.h CONFLICT (content): Merge conflict in include/configs/socrates.h Failed to merge in the changes. Patch failed at 0058.
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". ~/uboot$ git rebase --abort
I also tried git version 1.6.0.3 with the same result. Any idea what the problem might be ?
Thanks Peter