Suppose the scenario below:
Project P1 has a File F1 with 5 versions ( 1 to 5 ) and version 4 is supposed to be shared, branched , modified and finally, merged into version 5.
Steps
1.Version 4 of file F1 in Project P1 was pinned.
2.Project P2 shared the file, that had been branched immediately after the share operation.
So far, the version of file F1 in project P2 is the 4th one of Project P1.
3.The file F1 in project P2 was checked out , changed and checked in, creating a version 2 of the file in Project P2.
4.The pinned version of the file F1 in project P1 was unppined.
5.After all, the file F1 in project P1 was selected and the Merge Branch operation was executed
Normally, VSS should perform a Visual Merge between versions 5 ( in Project P1) and 2 ( in Project P2) to allow the user to solve the conflicts, using version 4 ( that was pinned ) as base.
However, VSS is not considering the differences between these versions as conflicts and, consequently, is not prompting the Visual Merge screen.
It is important to remark that this only occurs with one certain file.
Thanks a lot in advance for any help in figuring out what is going on.
Fernandes
Pin, Share, Branch troubles
domochan
Richard,
Thank you for your help.
Yes, the 5 steps were performed on all other files.
As the "troubled" file is a text one, I will be creating a new VSS database, as suggested.
I will keep you posted about the results.
Thanks again.
Fernandes
Niku
JoeCodester
Richard,
Here follow the tests I performed:
1) Created a new database and performed the 5 steps on the troubled file. Result: The merge occured as expected.
2) Restored the original project ( previously backed up) into the new database and repeated the 5 steps on the same troubled file. Result: The merge did not occur as expected.
According to these tests, I am about to conclude that the original databse may be corrupted and I will ask the VSS admin to verify it.
What do you think
thanks again
best regards
Fernandes
kaborka
Meanwhile I am still waiting for the VSS admin answer about the analyse procedure, I analysed the local base I created and where the troubled project was restored ( with the troubled file ).
Nothing wrong was detected and the problem persisted.
best regards
Rand AlThor
If so - is there anything unusual about that file (eg it's binary while the others are text, or vice versa) Can you try creating a new empty VSS database, adding the troublesome file, and reproducing the problem That could help narrow it down.