You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-issues@hadoop.apache.org by "Allen Wittenauer (JIRA)" <ji...@apache.org> on 2015/07/16 23:16:05 UTC
[jira] [Commented] (HADOOP-12244) recover broken rebase?
[ https://issues.apache.org/jira/browse/HADOOP-12244?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=14630347#comment-14630347 ]
Allen Wittenauer commented on HADOOP-12244:
-------------------------------------------
Specific, relevant error from https://builds.apache.org/job/PreCommit-HADOOP-Build/7293/console
{code}
============================================================================
============================================================================
Confirming git environment
============================================================================
============================================================================
HEAD is now at 0bda84f Move HDFS-7314 to 2.8 section in CHANGES.txt
Previous HEAD position was 0bda84f... Move HDFS-7314 to 2.8 section in CHANGES.txt
Switched to branch 'trunk'
Your branch is behind 'origin/trunk' by 6 commits, and can be fast-forwarded.
(use "git pull" to update your local branch)
It seems that there is already a rebase-apply directory, and
I wonder if you are in the middle of another rebase. If that is the
case, please try
git rebase (--continue | --abort | --skip)
If that is not the case, please
rm -fr "/home/jenkins/jenkins-slave/workspace/PreCommit-HADOOP-Build/.git/rebase-apply"
and run me again. I am stopping in case you still have something
valuable there.
ERROR: git pull is failing
{code}
> recover broken rebase?
> ----------------------
>
> Key: HADOOP-12244
> URL: https://issues.apache.org/jira/browse/HADOOP-12244
> Project: Hadoop Common
> Issue Type: Sub-task
> Components: yetus
> Affects Versions: HADOOP-12111
> Reporter: Allen Wittenauer
>
> One of the Jenkins hosts is failing during the git rebase that happens in bootstrap. We should probably do something better than just fail.
--
This message was sent by Atlassian JIRA
(v6.3.4#6332)