Migrating Files from a Sub-Branch to Parent Branch

rayvdz

Hi There,

I hope someone may be able to help us with this little problem we seem to be having.

We are using Teamsite version 5.0.1.0 7344 20020326 on NT 4.0.

Our current setup, whether it be right or wrong, is that all of our work is done within a single branch, which we call the BAU (Business As Usual) Branch. This single branch contains all of the assets for all our websites (6 including an Intranet site). This main branch is used for general BAU activity for daily releases to these websites.

We use sub branches to manage major application or content projects, which are deployed to our testing environments (system Test and UAT). When testing is completed on the sub-branch we integrate the changed files into the main BAU parent branch.

The sub-branches, when created, are obviously based off the BAU branch. There are a couple of issues that we are stuggling with here that I would love some advice on. The poblems seem to arise when we try to re-integrate the changed files with the main branch. We use the 'Copy to Area' functionality to copy all changed files to a workarea in the parent branch. From my undestanding, teamsite should be smart enough to only copy the files that have changed and notify me of differences between the sub-branch version and the parent branch. Instead, what is happening is that teamsite is telling us that files other than the ones we have changed are different. Here is an example of the file attributes of files that are supposed to be the same:

The Parent branch file properties:
STAGING: rolcreditcard_nms_1.jsp 514 8/21/02 11:46 LDNRMA00\2514
revision \main\bau\1

The Sub-branch file properites:
proj_r13: rolcreditcard_nms_1.jsprolcreditcard_nms_1.jsp 514 8/21/02 11:46 LDNRMA00\2514LDNRMA00\2514
revision \main\bau\proj_r13\3

This is exactly what appears in the file properities. As you can see the actual file properites ie date and time are exactly the same. so are file name and user but for the file name and user name being repeated.

What I would like to know is.... is this a bug? Should teamsite be working this way?

Help please....

Regards

Raymond van der Zalm

Web Solutions Consultant
Technology Services - eBusiness
Insurance Australia

Migrateduser

I believe it's working as advertised. Don't quite remember all of the under the cover ops but you should be able to do a Compare WA/Diff function from your sub-branch WA to a main branch's WA, provided that main branch's WA still have the same snapshot of the edition you branched off of. It'll show all of the modified files and you can copy it over to the main branch's WA. Afterward you can do a GetLatest to see if there's any conflict with the latest in main branch's Staging and merge any conflicts.

- Max
mchwang@yahoo.com