Merge Help

[davemilne]

Hi,

My company is currently using Vault 5 standard (I think I'm not sure how I check if it's professional or not)

We have a development and a production branch and prior to releases we need to copy our changes into the production branch.

we have in the past used the merge tool for this but it's not really doing what we want as it attempts to merge changes in both branches. What we really want is the ability to copy the dev branch over the production branch.

This seems like basic functionality but we can't actually work out how to do it.

Can anyone help?

Thanks

[Beth]

Check out the production branch. Drop the files and folders from the development branch right into your working folder that is holding the production branch. Vault will see that files changed. Perform a check in of the production branch.

It would be a good idea to make a label at the root of the production branch after the check in since this sounds like a good spot to have a reference point for it.

[davemilne]

Hi,

Thanks for the response.

Do you mean in the source gear client? I have tried dragging and dropping in there but it doesn't work.

If you mean through windows explorer this works for changes but new files do not get added into vault

Thanks

[Beth]

Check out in the Vault GUI client.

When you drop files into your working folder, you'll be using Windows Explorer for that.

You're right that Vault would detect changes but not the new files. For the new files, you could run a Detect New Files form the file menu. Or you could turn on File/Folder Ghosting from the Vault Tools - Options - General.

[davemilne]

The trouble with both those options is it still requires a manual check through of all the extra files and folders. There a lot of files and folders that we never want added to source safe.

And when the project is massive with a lot of folders, subfolders etc. this isn't a viable option.

am I missing something here?

[Beth]

You say you copy changes from Development to Production, but then seem to suggest that there are changes to the production system. Is someone also editing the Production system along the way? If so, why do you not want those changes to the Production system?

[davemilne]

Hi,

No changes should ever be made in our production branch without being made in the dev branch.

So from our point of view it's a straight copy over we want

Thanks

[Beth]

The merge branches should have been giving you that then. If it wasn't, we can take this offline and take a closer look at what was happening during your merge branches.

[davemilne]

Hi,

The problem I have is where the resolve merge status. I don't trust the procedure where I do this by hand it has led to mistakes in the past which is why we've looked for an easier solution given all we really want to do is copy the entire branch over.

Is there not any way to specify you want all the changes from the origin branch to take precedence when you do a merge?

Thanks

[Beth]

A merge takes a change set and applies it. If you're only doing one way merges, then there shouldn't be any real decision making involved. I can walk through some examples with you if you'd like.

Here's where the options for what you'd like to happen currently are:

1) Merge Branches

2) Copy over the changes to the production working folder and check in. This would require a separate Add for any added items.

3) Switch to shares instead of using branches, and pin one side of the share (Production) until you are ready for them to match. Once you unpin Production, it will be made to exactly match Development. Then you pin Production again so that it gets no more changes while you are working in Development.

You can try out a test on option 3 without affecting your current Production folder. Just make a share off of Development. Then pin that share.

[davemilne]

Hi,

Thanks again for all your help - we'll investigate the share option

Dave

[Beth]

If you need more details about using Sharing and Pinning, just send an email to support at sourcegear.com (attn: Beth) with a link to this forum thread. I can email you more specific details.