Community
Participate
Working Groups
1. had a split of a branch yesterday 2. tried to update my branch of a package with the latest, so did a merge against HEAD 3. saw the incomming change I wanted - a new file in HEAD 4. merged it locally Result (bug?): the file came in unmanaged, and thus without revision info. I would expect to get the same revision of the file as was released in HEAD, yes? Bug: try to add the file to version control. This fails (of course) because it "was added by thirdparty".
It is expected that new files (you don't have them in the branch loaded in the workbench) that are updated become unmanaged as a result of the merge. Merging is *always* a content operation in CVS as merge sources are not persisted in the repo! Once the unmanaged file is in your workspace you can add/commit. I've verified this several times today and it works for me. To get the error you mention, you would of had to of already released that file to the branch at some other time.
Marking future. Would be good to be able to tag files on different branches under those conditions where we can. In my failure case I had branched the entire project, then backed out realizing I really only wanted to branch the package. So I replaced the project with head, but reverted the package with the branch. I then tried to 'add' the file that was in head to my branch.
Reopening
We help the user by offering to add files during a commit. In the case of conflicting additions, we offer Mark as Merged and Override and Commit.
