Merging changes

code · Post by **code** » Wed Mar 14, 2007 7:19 am

Hi,

I am trying to use the Merge Branches tool for the first time and it doesn't seem to be working right.

I am testing the merge tool and have added a file to the trunk, which I then want to merge with a branch i.e. all that should be done is the added file will be added to the branch.

I can select the origin and target folders fine, there are no conflicts when scanning target folder. The select changes to be merged step does nothing. It says it is retrieving the history from the origin but it is doing nothing. I have left it for at least 20 mins and nothing. You can click in the grid and move the columns but the grid is empty.

Problem is the Next and Previous buttons are greyed out so I can't proceed.

Does anyone have any ideas?

Many thanks

Beth · Post by **Beth** » Wed Mar 14, 2007 8:07 am

How many files and changes have happened between the two folders since the branch had occurred? If it's been months, then it could take a while to retrieve a huge history.

Are people trying to make changes to those two areas while you are performing the merge branchs?

You may wish to put your Vault Server Log into debug mode, try again, and then check it for errors.

Also, can you go to the Help - Technical Support in your client and copy the information from there for me? That will give me a more details on the environment.

code · Post by **code** » Wed Mar 14, 2007 8:16 am

Hi Beth,

Thanks for the reply.

My system info is:

Client Information
Vault Client Version: 3.5.1.4786
.Net Framework Version: 1.1.4322.2032
Operating System: Microsoft Windows XP Professional
Service Pack: 2.0
OS Version: 5.1.2600
Total Physical Memory: 2 GB
Time Zone: (GMT) Greenwich Mean Time : Dublin, Edinburgh, Lisbon, London

Server Information
Vault Server Version: 3.5.1.4786
.Net Framework Version: 1.1.4322.2300
Operating System: Microsoft(R) Windows(R) Server 2003, Standard Edition
Service Pack: 1.0
OS Version: 5.2.3790
Timezone: (GMT) Greenwich Mean Time : Dublin, Edinburgh, Lisbon, London
SQL Version: Microsoft SQL Server 2000 - 8.00.2039 (Intel X86)
May 3 2005 23:18:38
Copyright (c) 1988-2003 Microsoft Corporation
Standard Edition on Windows NT 5.2 (Build 3790: Service Pack 1)

--

I had done no changes between the trunk and branch except for adding a file to the trunk. I then wanted to merge the branch with the trunk content to see if the added file was replicated to the branch.

I have never done this before so was just testing.

I will turn on the debug server log to see if that throws anything up.

Thanks again