"Selvakumar, Sudharsan" wrote:
> HI CCIUG Friends,
>
> I have a file element say test.vbp. And it exists
> in four branches. when I look at the version tree of that file element from
> the main branch I can see that it exists in all the four branches and I can
> see version 0 of that file in the bufix branch(one of the 4 branches) .
> But when when I look at the version tree from the bugfix branch view of the
> same file element I can see that it has more than 10 versions in bugfix
> branch, and it doesnt have any versions in any of the other 3 branches.
> when I look at the history for test.vbp from bugfix branch I can see that a
> new version has been created. But the file name (test.vbp) is same in all
> the branches.
>
> So i think it has lost the link with other
> branches. can anybody helpme, to link it back!!!
If you see different version trees when looking at the file on different
branches,
then this is a very strong indication that you really have two different
elements,
each with its own version history. What possibly happened was this:
Somebody was working on the bugfix branch. They checked out the
directory containing test.vbp and checked out test.vbp itself. They then
decided that they didn't need test.vbp and removed it from the directory.
They then changed their minds and created a view-private file called
test.vbp, which they then turned into a new element with "ct mkelem".
Then they checked in the directory.
You should look at the version history of the directory. In one of the versions
on the bugfix branch you'll find a delta showing test.vbp being both removed
and added. Note that it is also possible for the version that removes the old
test.vbp to be a different version from that which adds the new test.vbp.
By looking at who added the new test.vbp you'll find out who the culprit is.
You should resolve the situation by checking out the directory, removing
the bad test.vbp, add the old test.vbp back (by using ct ln), checking out the
old test.vbp, and manually merging in the changes that were added to the
bad test.vbp.
Good luck!
Lezz Giles
-- Leslie Giles Software Release Manager Avici Systems Inc lgiles@avici.com Phone: 978.964.2030 Fax: 978.964.2100"Do not fear the merge"
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
This archive was generated by hypermail 2b29 : Sun May 06 2001 - 00:26:48 EDT