Merging does not copy files added in child branch

dist0rti0n · Post by **dist0rti0n** » Fri Dec 15, 2006 11:55 pm

I've setup a few folders to test the automatic branching and merging in vault.

I create a parent trunk and then branch 2 children off of it. In one of the children I modify a file copied from the trunk and I also add a new file. When I merge in vault, vault successfully merges the file that was copied from the trunk but does not copy the file added in the child branch.

Is this expected behavior? I thought if I merged back to the trunk that it would copy any newly added files as part of the merge.

lbauer · Post by **lbauer** » Sat Dec 16, 2006 5:54 pm

Yes, it should add the new file to the trunk. Did you check the pending change set to see if the transaction was there, and still needed to be committed?

If you modified items in different change sets (folder versions), did you choose to merge the changeset that contained the "add" operation?

If you did the above two steps and the file still was not added, check the server log to see if there was an error uploading the file.

dist0rti0n · Post by **dist0rti0n** » Sun Dec 17, 2006 7:27 pm

Thanks for the quick reply. I guess I wasn't reading what vault was telling me closely enough. Vault was creating the transaction to add the file and placing it in my pending changeset (even told me that on the summary screen) but I didn't notice it. I expected for the file to be added automatically and committed as part of the merge operation but I guess that final step has to be done manually.

Thanks!