[
Date Prev][
Date Next][
Thread Prev][
Thread Next][
Date Index][
Thread Index]
[
List Home]
|
Re: [egit-dev] rebase always fails
|
On 01/12/2012 11:11 PM, Matthias Sohn wrote:
> 2012/1/12 Markus Duft <markus.duft@xxxxxxxxxx <mailto:markus.duft@xxxxxxxxxx>>
>
> Hi!
>
> how can i find out more about why a rebase fails in the UI? i have a branch which i reproducibly can't rebase on origin/master. it starts working, tells me that it rewinds HEAD, starts applying and the just "Aborting rebase ..." and after that only a "Rebase failed" message with no further information. doing the rebase on the command line works.
>
> i can debug if that's required to get more info, as i'm using a current git version of egit and jgit :)
>
>
> most probably your commit graph is too complex to be handled by the
> resolve merge strategy used internally by jgit's rebase implementation.
>
Hi!
Thanks for taking time. I fear it's not that simple... on the command line it works (see below). i have made a short screencast [1], where you can see the problem and also the history...
[1] http://dev.gentoo.org/~mduft/rebase.mp4
> Try the same rebase using the resolve merge strategy from c-git, if this
> also fails the restricted capabilities of the resolve strategy are most
> probably the reason why EGit fails to handle this rebase. The recursive
> strategy isn't yet implemented in jgit
>
> git rebase --strategy resolve [<upstream>] [<branch>]
that worked...
mduft@s01en22 /fast/wamas5/workspaces/runtime-EclipseApplication/wamas5 $ git rebase --strategy resolve origin/master
First, rewinding head to replay your work on top of it...
Trying simple merge.
[detached HEAD 6657d9e] WPOB main refactoring
Author: Robert Lechner <robert.lechner@xxxxxxxxxx>
22 files changed, 113 insertions(+), 385 deletions(-)
rename com.wamas.ide.wpob.builder/src/com/wamas/ide/wpob/builder/taskchains/{TaskChainRepository.java => Repository.java} (81%)
rename com.wamas.ide.wpob.builder/src/com/wamas/ide/wpob/builder/taskchains/{TaskChainBuildWorkspace.java => TaskChainCleanBuildWorkspace.java} (74%)
rename com.wamas.ide.wpob.builder/src/com/wamas/ide/wpob/builder/taskchains/{TaskChainHbFromScratch2.java => TaskChainNightlyFromScratch.java} (57%)
rename com.wamas.ide.wpob.builder/src/com/wamas/ide/wpob/builder/tasks/{CheckHbPrerequisites.java => CheckHeadlessPrerequisites.java} (95%)
rename com.wamas.ide.wpob.builder/src/com/wamas/ide/wpob/builder/tasks/{TaskProjectBuildAll2.java => TaskBuildAllProjects.java} (97%)
rewrite com.wamas.ide.wpob.builder/src/com/wamas/ide/wpob/builder/tasks/TaskCheckoutProjects.java (76%)
delete mode 100644 com.wamas.ide.wpob.builder/src/com/wamas/ide/wpob/builder/tasks/TaskProjectBuildUpToDbalGenerator.java
delete mode 100644 com.wamas.ide.wpob.builder/src/com/wamas/ide/wpob/builder/tasks/TaskProjectBuildUpToLayoutGenerator.java
delete mode 100644 com.wamas.ide.wpob.builder/src/com/wamas/ide/wpob/builder/tasks/TaskRunDbalGenerator.java
rename com.wamas.ide.wpob.builder/src/com/wamas/ide/wpob/builder/tasks/{TaskWorkspaceBuildClean.java => TaskWsCleanProjects.java} (76%)
rename com.wamas.ide.wpob.builder/src/com/wamas/ide/wpob/builder/tasks/{TaskCreateRepositoryLocation.java => TaskWsCreateRepositoryLocation.java} (74%)
rename com.wamas.ide.wpob.builder/src/com/wamas/ide/wpob/builder/tasks/{TaskCreateJre.java => TaskWsPropsCreateJre.java} (95%)
Committed: 0001 WPOB main refactoring
All done.
Regards,
Markus
>
> --
> Matthias
