Topic
  • 8 replies
  • Latest Post - ‏2013-05-07T15:57:18Z by Cleardoctor
Cleardoctor
Cleardoctor
20 Posts

Pinned topic Can't resume or cancel while rebasing a stream

‏2013-05-01T14:48:58Z |

Hi Fellows,

I can't cancel or resume or complete the rebase operation on a stream. Everytime I resume rebase, it automatically checks out one particular file and mark it as reserve and generates an error "particular file can't be merge". If I check in the file again, it checks out automatically while I resume rebase. If I try to cancel it, then it says "you have checkin on your rebase integration activity and can't cancel the operation." Any idea how to cancel or complete this operation.

 

Thanks

 

 

 

  • ezizza
    ezizza
    6 Posts

    Re: Can't resume or cancel while rebasing a stream

    ‏2013-05-01T14:55:42Z  

    Might be best to open a PMR that way a UCM expert can look at this. 

    -Eric

  • JirongHu
    JirongHu
    683 Posts

    Re: Can't resume or cancel while rebasing a stream

    ‏2013-05-02T01:43:38Z  

    It's already told you that particular file can't be merged automatically (maybe binary or something in that file, just open it with Notepad and check). You can manually merge that file and resume rebase.

    Jirong

  • Jim_Zarakis
    Jim_Zarakis
    2 Posts

    Re: Can't resume or cancel while rebasing a stream

    ‏2013-05-02T06:39:36Z  

    Sounds like you have done check-ins to a incompleted rebase or delivery.

    If so.

    It can't cancel unless you remove manual checkins. If you don't know which checkins then..

    Do a "cleartool describe -l" or a "cleartool  lsactivity  -l" on your activity and look in list for files that dont have CHECKEDOUT as extended path.

    Alternative if can filter out (i.e. unix grep) something like following will list them

    And by the way from CMD line you will need to use "-xhlink " option. e.g.

    cleartool  rmver  -xhlink /your_version

    Hope that helps.

    -Jim

     

     

     

  • Dave-Robinson
    Dave-Robinson
    116 Posts

    Re: Can't resume or cancel while rebasing a stream

    ‏2013-05-02T10:27:32Z  

    In general, if the deliver checks out a file but cannot automatically merge it, you need to manually merge it.

    Determine the appropriate content for the file, check it in, and "draw a merge arrow"

    The merge arrow can be added using the GUI - from Version Tree Browser for example,

    or by the following command line

    cleartool merge -to filename -ndata -comment "file was manually merged" -version development-stream-version

     

    That said, I um unclear the real current state of your deliver operation, so it maybe best to raise a PMR.

    David

  • Cleardoctor
    Cleardoctor
    20 Posts

    Re: Can't resume or cancel while rebasing a stream

    ‏2013-05-02T13:26:57Z  

    Thanks all for the response.

    Somebody already delivered my changes and I have to cancel this rebasing.

    Is there anyway I can cancel this rebase operation without going through merge arrow?

     

     

     

  • Dave-Robinson
    Dave-Robinson
    116 Posts

    Re: Can't resume or cancel while rebasing a stream

    ‏2013-05-03T01:51:19Z  

    Thanks all for the response.

    Somebody already delivered my changes and I have to cancel this rebasing.

    Is there anyway I can cancel this rebase operation without going through merge arrow?

     

     

     

    If it is saying "cannot cancel because someone else is already completing it" then do

     ucmutil reset_deliver [stream-selector]

           and retry the "deliver -cancel"

     

    if it is saying "the change set contains checked in versions" then you must remove the versions.

      cleartool rmver -xhlinks version-path

     

    But if you need more specific help, I suggest going through a PMR

  • SANDHYA@IBM
    SANDHYA@IBM
    24 Posts

    Re: Can't resume or cancel while rebasing a stream

    ‏2013-05-07T08:25:21Z  

    If it is saying "cannot cancel because someone else is already completing it" then do

     ucmutil reset_deliver [stream-selector]

           and retry the "deliver -cancel"

     

    if it is saying "the change set contains checked in versions" then you must remove the versions.

      cleartool rmver -xhlinks version-path

     

    But if you need more specific help, I suggest going through a PMR

    http://www-01.ibm.com/support/docview.wss?uid=swg21125189

    check this post..might be it can be of some help.

  • Cleardoctor
    Cleardoctor
    20 Posts

    Re: Can't resume or cancel while rebasing a stream

    ‏2013-05-07T15:57:18Z  

    http://www-01.ibm.com/support/docview.wss?uid=swg21125189

    check this post..might be it can be of some help.

    That's a good link but unfortunately safety triggers didn't allow me to remove those versions. I resolved the isue with merge arrow and rebase it but didn't deliver it.

    Thanks all for the help.