using Vault version 4.1.4 (18402)
I've just had a very annoying problem, that I've been having for some time, but haven't been able to pinpoint and thought that it was a mistake of me or one of my programmers.
Here's the situation: I have a folder in the repository with the current version. When development starts, we branch that folder, work in the branch, and then merge it back. I created a branch for a feature, and did a set of checkins in that branch, including renaming a file, and after renaming it, modifying it further.
When i went to merge all the checkins from the branch, Vault did the rename first and was successfull, but when it showed me the list of the files that were about to be checked in, the renamed file was not marked and showed as Not Found. I was not able to mark the file either.
I tried to cancel and redo the merge, but it was the same. And indeed, after finishing the checking, the modifications I made to the renamed file didn't take, and i've had to redo it manually.
This is a very serious problem, as I can't trust Vault now to take all of my changes. I was lucky this time that there was a small set of changes. If it was a bigger change, it could have easily gotten lost in all the changes.
Is this a known issue? any workarounds ?
Rename and checkin misses file
Moderator: SourceGear
Re: Rename and checkin misses file
Does it give you the option to choose the new file name to apply those changes to? When you get to the item listed in red during the merge, double-click it, and see if it lets you choose the renamed file to apply the changes after the rename. I have attached an example scenario.
- Attachments
-
- Branch test of merging a renamed file.doc
- (186.5 KiB) Downloaded 176 times
Re: Rename and checkin misses file
Thanks, I followed the steps and indeed it took all the changes.
But I had no idea that I could double click the file to select another file, and the red highlight only came up after double clicking. Can you (general you) add the red highlight before the double click, and add a note about it in the relevant screen ?
But I had no idea that I could double click the file to select another file, and the red highlight only came up after double clicking. Can you (general you) add the red highlight before the double click, and add a note about it in the relevant screen ?
Re: Rename and checkin misses file
I have put in a feature request. Thank you for your feedback.
Right now the only indication to double-click the red items is the note to double-click them for more information.
F: 15000
Right now the only indication to double-click the red items is the note to double-click them for more information.
F: 15000
Beth Kieler
SourceGear Technical Support
SourceGear Technical Support