When trying to edit an existing windows form in a vb.net project a message prompts me to check out the file for edit. After doing so, a check mark appears next to the file, but I am still not able to edit the file. When I try to do so, it asks me to check out the file again, when I press ok, an error pops up telling me that I already have the file checked out.
Not even closing and opening the project takes care of this problem. If I try to check in the file I get a message that it is in need of a merge. After pressing ok, I get this message: (SCCCheckin Method: Working folder baseline 1093 does not match request baseline 1496) and the file fails to resolve the pending merging and check in.
So I tried to take care of the merging by using the client utility and realized that the repository copy was much older than my working copy, which of course invalidates the suggested merge. How do I indicate to vault that I want to update the repository with my current working copy? Isn’t the copy in the repository supposed to have the most recent changes or to be updated every time we check in a file? Would addressing the merge issue also resolve the problem that we are having with not being able to edit the file?
Please note that we have 2 developers working on the same project, but never on the same file simultaneously. We are currently only using the check out and check in functionality of Vault. In the past week we have lost changes made to the project by having files revert back to an older copy when they are checked out. We also noticed that file history does not seem to accurately reflect the activity (check outs and ins) on a files.
We are working with version 3.0.6 of vault.
I’d appreciate your comments and suggestions.
Problems with version 3.0.6 of Vault
Moderator: SourceGear
It does reflect the check ins that I;ve made. It just does not reflect all of them. For example, this file that I am currently unable to edit shows that it was last checked in on the 5th, but we made changes to it as early as yesterday. We have not at any point retored a backup or done a rollback.
The most pressing issue at this point is that we are unable to edit this file, and I would like to address the issue withut having to take the project out of source control.
TIA
Ingrid
The most pressing issue at this point is that we are unable to edit this file, and I would like to address the issue withut having to take the project out of source control.
TIA
Ingrid
Just make sure I understand: after you made changes, did you check the file back in?iserrano wrote:It does reflect the check ins that I;ve made. It just does not reflect all of them. For example, this file that I am currently unable to edit shows that it was last checked in on the 5th, but we made changes to it as early as yesterday.
Bring up the Vault standalone client, and see what the status of the file is, and also check the working folder - is it in the location where you are actually editing the file?The most pressing issue at this point is that we are unable to edit this file, and I would like to address the issue withut having to take the project out of source control.
Either way, you should be able to undo the check out (and keep any changes you've made), and then do Get Latest. If the merge is failing for some reason, you can save off the file (if it has changes), do a Get that overwrites the file, and then copy your changes back over the file and it should be able to be checked in.
It sounds like there might be something generally wrong with your client state - have you changed working folder locations recently, or deleted anything from you local client cache (in c:\docs & settings\[user]\application data\sourcegear)?
iserrano wrote:
It does reflect the check ins that I;ve made. It just does not reflect all of them. For example, this file that I am currently unable to edit shows that it was last checked in on the 5th, but we made changes to it as early as yesterday.
Just make sure I understand: after you made changes, did you check the file back in?
Quote:
The most pressing issue at this point is that we are unable to edit this file, and I would like to address the issue withut having to take the project out of source control.
The status of the file is needs merge. Since the working copy is newer than the repository copy I would like to just make the repository copy the same as my working copy. BTW, how come the repository has an older version of the file?
>Either way, you should be able to undo the check out (and keep any >changes you've made), and then do Get Latest. If the merge is failing for >some reason, you can save off the file (if it has changes), do a Get that >overwrites the file, and then copy your changes back over the file and it ?>should be able to be checked in.
This solution makes me feel that we can not rely on Vault . Instead I would like to find out what we might be doing wrong that led to loosing our most recent changes.
>It sounds like there might be something generally wrong with your client >state - have you changed working folder locations recently, or deleted >anything from you local client cache (in c:\docs & settings\[user]>\application data\sourcegear)?
We have not changed the working folder location at all. And the current reference is corrent. We also have not deleted anything from the local client cache.
It does reflect the check ins that I;ve made. It just does not reflect all of them. For example, this file that I am currently unable to edit shows that it was last checked in on the 5th, but we made changes to it as early as yesterday.
Just make sure I understand: after you made changes, did you check the file back in?
Quote:
The most pressing issue at this point is that we are unable to edit this file, and I would like to address the issue withut having to take the project out of source control.
The status of the file is needs merge. Since the working copy is newer than the repository copy I would like to just make the repository copy the same as my working copy. BTW, how come the repository has an older version of the file?
>Either way, you should be able to undo the check out (and keep any >changes you've made), and then do Get Latest. If the merge is failing for >some reason, you can save off the file (if it has changes), do a Get that >overwrites the file, and then copy your changes back over the file and it ?>should be able to be checked in.
This solution makes me feel that we can not rely on Vault . Instead I would like to find out what we might be doing wrong that led to loosing our most recent changes.
>It sounds like there might be something generally wrong with your client >state - have you changed working folder locations recently, or deleted >anything from you local client cache (in c:\docs & settings\[user]>\application data\sourcegear)?
We have not changed the working folder location at all. And the current reference is corrent. We also have not deleted anything from the local client cache.
We need to try to reproduce this but it might be impossible to figure out what happened previously -the best way is to try to get it to happen again and note what steps were taken. This sounds
Again, I want to verify: You changed files, and then checked them in, but they don't appear in Vault history? What method did you use to check the files in?
You might want to bring up the Vault GUI client when you check a file in and note what state it reports, and whether or not the checkin happened.
One other question: Is there an _sgbak folder in your working directory that contains versions of the files that you believe were not checked into the server?
Again, I want to verify: You changed files, and then checked them in, but they don't appear in Vault history? What method did you use to check the files in?
You might want to bring up the Vault GUI client when you check a file in and note what state it reports, and whether or not the checkin happened.
One other question: Is there an _sgbak folder in your working directory that contains versions of the files that you believe were not checked into the server?