Get Latest: Overwrite or Attempt automatic merge?

IvanGB · Post by **IvanGB** » Mon Oct 29, 2007 5:47 am

Hi.

In my VS2005 project, once I import any graphic (.jpg) into a control, it automaticaly creates a copy of it into the Resources project folder. Then, once I commit in the Vault Pending Changes window, this .jpg goes to the repository and I can check it is there. Then, in another machine, If I Get Latest and check "Attempt automatic merge", it looks like this new .jpg file is not copied to this machine's Working Directory, and I seem to have to check "Overwrite" to get it.

I would just like to know if this is the expected behaviour, and sorry if it is too much of a stupid question...

lbauer · Post by **lbauer** » Mon Oct 29, 2007 3:41 pm

Which version of Vault are you using, and if you're using Vault 4.0.x, which plugin?

IvanGB · Post by **IvanGB** » Mon Oct 29, 2007 4:05 pm

lbauer wrote:Which version of Vault are you using, and if you're using Vault 4.0.x, which plugin?

Vault 4.0.4
Visual Studio 2005

ian_sg · Post by **ian_sg** » Tue Oct 30, 2007 12:42 pm

Sounds like a possible bug. Sorry for the inconvenience, I'll follow up if we can reproduce it.

ian_sg · Post by **ian_sg** » Wed Oct 31, 2007 8:23 am

On the second machine, is the file modified? If so, this would be expected behavior. A binary file like a jpeg is not mergeable, so the only way to do a get latest if the file is modified would be to force an overwrite.

IvanGB · Post by **IvanGB** » Wed Oct 31, 2007 7:03 pm

Hi Ian.

Thanks for your reply.

No, the file is not modified on the second machine. It doesn't even exist there, as it was added on the first machine, commited there, and then it should be copied to the second machine on the Get Latest. So, it didn't need to merge.

ian_sg · Post by **ian_sg** » Wed Oct 31, 2007 9:29 pm

Ah. Prior to 4.0.5, a file newly added to a project required 2 get latest commands on other machines: 1 to get the new project file indicating the file's presence, and another to actually get the file. 4.0.5 fixed this.

IvanGB · Post by **IvanGB** » Thu Nov 01, 2007 4:24 pm

Oh, OK.

Thanks Ian.