[jbossts-issues] [JBoss JIRA] (JBTM-1288) narayana.sh doesn't tollerate situation where existing JBossAS clone is on 'no branch'

Tom Jenkinson (JIRA) jira-events at lists.jboss.org
Fri Oct 26 08:18:07 EDT 2012


     [ https://issues.jboss.org/browse/JBTM-1288?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ]

Tom Jenkinson updated JBTM-1288:
--------------------------------

    Component/s: Build System
                     (was: Testing)

    
> narayana.sh doesn't tollerate situation where existing JBossAS clone is on 'no branch'
> --------------------------------------------------------------------------------------
>
>                 Key: JBTM-1288
>                 URL: https://issues.jboss.org/browse/JBTM-1288
>             Project: JBoss Transaction Manager
>          Issue Type: Bug
>      Security Level: Public(Everyone can see) 
>          Components: Build System
>            Reporter: Paul Robinson
>            Assignee: Paul Robinson
>             Fix For: 4.17.1, 5.0.0.M2
>
>
> If the previous run needed to resolve a conflict, the branch will be left in a state where the rebase was not completed and thus on "no branch".
> I think the safest thing to do would be to attempt to "git rebase --abort" before calling "checkout 5_BRANCH". This is because a previous test run could have failed to rebase, and you don't want it to affect subsequent tests.
> Alternatively, we could finish the rebase, by, doing a "git add" of the change and then a "git rebase --continue", but this may be harder to get right. Also, it doesn't solve the problem where this can go wrong, leaving the workspace in an un-recoverable state.

--
This message is automatically generated by JIRA.
If you think it was sent incorrectly, please contact your JIRA administrators
For more information on JIRA, see: http://www.atlassian.com/software/jira


More information about the jbossts-issues mailing list