Vault comparing wrong version of files.

If you are having a problem using Vault, post a message here.

Moderator: SourceGear

Post Reply
tpatton
Posts: 16
Joined: Thu Oct 07, 2004 7:44 pm
Location: Wilmington, DE

Vault comparing wrong version of files.

Post by tpatton » Wed Dec 21, 2005 10:51 am

I'm using Vault as a single user on a single development machine, so I don't use checkin/checkout, I just let the Vault client detect what files I have changed, and add new files/folders when I need to. I've noticed an odd bug and today I think I was able to narrow it down.

When I opened the client today, a file that I had not touched in a while came up as needing a merge. It appeared that Vault was comparing the file to a version 2 updates ago, not the most recent one viewable in the history. I just did "resolve merge status" since I knew the file on my hard drive was the correct one. I can't figure out why it picked today to mess up on a file I haven't edited in months or why it pulled the wrong version up. Unfortunately I have no idea how to replicate this bug.

lbauer
Posts: 9736
Joined: Tue Dec 16, 2003 1:25 pm
Location: SourceGear

Post by lbauer » Wed Dec 21, 2005 11:52 am

You can get a "needs merge" status on a modified file in the working directory if the baseline is incorrect. This can happen if the _sgvault hidden state folder was deleted at some point and then recreated.
Linda Bauer
SourceGear
Technical Support Manager

tpatton
Posts: 16
Joined: Thu Oct 07, 2004 7:44 pm
Location: Wilmington, DE

Post by tpatton » Wed Dec 21, 2005 12:50 pm

lbauer wrote:You can get a "needs merge" status on a modified file in the working directory if the baseline is incorrect. This can happen if the _sgvault hidden state folder was deleted at some point and then recreated.
I'm almost 100% sure that the _sgvault directory was never deleted. Plus there were a few other files in that directory and none of them came up as needing a merge.

lbauer
Posts: 9736
Joined: Tue Dec 16, 2003 1:25 pm
Location: SourceGear

Post by lbauer » Wed Dec 21, 2005 12:55 pm

OK. Let us know if you continue to experience problems with this.
Linda Bauer
SourceGear
Technical Support Manager

Post Reply