[jbossts-issues] [JBoss JIRA] (JBTM-1462) Create a script to rebase 5_branch and 4_branch against AS7 master

[Paul Robinson (JIRA)]

     [ https://issues.jboss.org/browse/JBTM-1462?focusedWorklogId=12428695&page=com.atlassian.jira.plugin.system.issuetabpanels:worklog-tabpanel#worklog-12428695 ]

Paul Robinson logged work on JBTM-1462:
---------------------------------------

                Author: Paul Robinson
            Created on: 11/Feb/13 5:36 AM
            Start Date: 11/Feb/13 5:36 AM
    Worklog Time Spent: 1 hour, 30 minutes 

Issue Time Tracking
-------------------

    Remaining Estimate: 0 minutes  (was: 1 hour, 30 minutes)
            Time Spent: 2 hours  (was: 30 minutes)
            Worklog Id:     (was: 12428695)


> Create a script to rebase 5_branch and 4_branch against AS7 master
> ------------------------------------------------------------------
>
>                 Key: JBTM-1462
>                 URL: https://issues.jboss.org/browse/JBTM-1462
>             Project: JBoss Transaction Manager
>          Issue Type: Task
>      Security Level: Public(Everyone can see) 
>          Components: Build System
>            Reporter: Paul Robinson
>            Assignee: Paul Robinson
>             Fix For: 5.0.0.M2
>
>   Original Estimate: 2 hours
>          Time Spent: 2 hours
>  Remaining Estimate: 0 minutes
>
> Rebasing against AS7 master needs to be done regularly, especially when you are making a change that is dependent on a new commit from upstream. 
> Doing the rebase is dangerous as it needs a -f. By scripting this, we can hopefully make the operation safer. This is providing the script is reviewed carefully. 
> We may also want the script to take a backup of 5_branch prior to the forced update, so that any error can be easily reverted.

--
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