Вопрос

I hijacked version 11 of MyFile.cc and made changes. In the meantime, the MyFile.cc was changed on the trunk and renamed to NewMyFile.cc. I want to branch off the original version that I had hijacked, and then merge back to the trunk. So I created a config spec that selected version 11 of NewMyFile.cc. I verified that the cs selects that version. However, when I attempt to checkout NewMyFile.cc, I get the following error:

Created branch "my_branch" from "NewMyFile.cc" version "/main/int_branch/11".
cleartool: Error: Element already has a branch of type "my_branch" ("/main/int_branch/my_branch").
cleartool: Error: Unable to create branch requested by -mkbranch option in config spec.
cleartool: Error: Unable to check out "NewMyFile.cc".

Edit: I should add that there was no my_branch for the element before I attempted the checkout.

Это было полезно?

Решение 2

I used the mkbranch command to create the branch that ClearCase refused to create via the -mkbranch clause in the config spec. I then loaded the .keep file from the original hijack into the new branch and checkedin the file.

Другие советы

Simply create another branch in your config spec:

  • NOT -mkbranch mybranch (since you already have one, or so ClearCase believes)
  • but -mkbranch mybranch2

Then, in a separate view referencing only mybranch, try to merge mybranch2 to mybranch.

Лицензировано под: CC-BY-SA с атрибуция
Не связан с StackOverflow
scroll top