I create a text file test.txt; in Vault I create new folder TEST and add test.txt to it.
Then I reset the read-only of the local test.txt, modify it and save.
Then I try to "get latest version" from Vault. Vault shows the prompt.
If I set Modified Local File to Overwrite, Vault overwrites; it also creates the subfolder _sgbak with the old version. How that is supposed to be used? It's not check-out, and in Vault, there's no action like "undo".
If I set Modified Local File to Do not overwrite/merge later, Vault overwrites the local file without the prompt, though the checkbox Prompt for modified files was checked. Also, according to Help and even the name of the mode, Vault shouldn't overwrite the file in this case - it should create the subfolder and allow to merge later.
This also applies to check out operation.
If I set Modified Local File to Attempt automatic merge with checked prompt for modified files, there's no prompt, but the automatic merge seems to work like "leave". Example: the local file is
1
3
4
The file in repository is
1
2
3
After the automatic merge, I would expect the local file to be
1
2
3
4
In reality, the local file remains unchanged.
Looks to me like bugs. Am I right, or I misunderstand something?
Get Latest Version
Moderator: SourceGear
Get Latest Version
Vadim Rapp
Re: Get Latest Version
Vault creates a backup when overwriting files with the status "Renegade" or "Unknown," since Vault doesn't have have proper baseline information for these types of files. You can manually retrieve them from _sgbak.vrapp wrote:I create a text file test.txt; in Vault I create new folder TEST and add test.txt to it.
Then I reset the read-only of the local test.txt, modify it and save.
Then I try to "get latest version" from Vault. Vault shows the prompt.
If I set Modified Local File to Overwrite, Vault overwrites; it also creates the subfolder _sgbak with the old version. How that is supposed to be used? It's not check-out, and in Vault, there's no action like "undo".
I was able to replicate this only when the file status was Unknown and "Prompt for modified files" wasn't checked. I'll log this as a bug. Renegade files were not overwritten.vrapp wrote:If I set Modified Local File to Do not overwrite/merge later, Vault overwrites the local file without the prompt, though the checkbox Prompt for modified files was checked. Also, according to Help and even the name of the mode, Vault shouldn't overwrite the file in this case - it should create the subfolder and allow to merge later.
This also applies to check out operation.
Merge isn't quite that smart. The diff/merge tool compares files line by line. So line #1 of Local File is compared to line #1 of Repository File, line #2 of Local File is compared with Line #2 of Repository File, etc.vrapp wrote:If I set Modified Local File to Attempt automatic merge with checked prompt for modified files, there's no prompt, but the automatic merge seems to work like "leave". Example: the local file is
1
3
4
The file in repository is
1
2
3
After the automatic merge, I would expect the local file to be
1
2
3
4
In reality, the local file remains unchanged.?
If the lines aren't an exact match, diff/merge tool treats this as a conflict. It doesn't re-arrange lines automatically. In this case, the contents of the second and third lines is different, so there is a conflict.
There should be a message in the Messages tab at the bottom of your client that says the automatic merge has failed.
Linda Bauer
SourceGear
Technical Support Manager
SourceGear
Technical Support Manager
Re: Get Latest Version
lbauer wrote:I was able to replicate this only when the file status was Unknown and "Prompt for modified files" wasn't checked. I'll log this as a bug. Renegade files were not overwritten.vrapp wrote: If I set Modified Local File to Do not overwrite/merge later, Vault overwrites the local file without the prompt, though the checkbox Prompt for modified files was checked. Also, according to Help and even the name of the mode, Vault shouldn't overwrite the file in this case - it should create the subfolder and allow to merge later.
This also applies to check out operation.
I just rechecked it with the latest version 2.0.5. "Get latest version" of a checked in file, while a newer writeable version of the same file existed in the working folder. The file showed as Renegade in Vault. Tried all three options: overwrite, merge later, and Attempt merge. "Prompt for modified files" was checked in all cases.
Vauld displayed the prompt only in "overwrite".
Vadim Rapp
Re: Get Latest Version
We'll look into this one as well.vrapp wrote:
I just rechecked it with the latest version 2.0.5. "Get latest version" of a checked in file, while a newer writeable version of the same file existed in the working folder. The file showed as Renegade in Vault. Tried all three options: overwrite, merge later, and Attempt merge. "Prompt for modified files" was checked in all cases.
Vauld displayed the prompt only in "overwrite".