File did change in both versions (I made both sets of changes) in fact I manually moved some changes back from. This is a simple one level based branch merge from x.x.4 to x.x.5. Running tf properties reveals this information about the two files (there are multiple files this affects, not just this pair) Trying the "Merge changes for me" results in an error that there are conflicts.
We just tried to do a B->Trunk merge and are running into the case where the "Merge changes for me", "Keep changes in target branch", and "Copy item from source branch" are enabled, but the "Merge changes in merge tool" is disabled. The UTF-8 files were causing problems for GCC on the Linux target, and we changed all encodings on both branches and the Trunk to Windows-1252 with Unix line endings. At one point there was a difference between the branches where some files were Windows-1252 and others were UTF-8. We have gone through several repetitions of merging A->Trunk->B and B->Trunk->A already and this has always worked. The paths for platformA and platformB are a few levels deeper than that, but that hasn't caused problems in the past. $/project/Common/core - "Trunk" or common branch ancestor Work proceeds independently on both of the branches and then periodic merges occur to the common trunk so that features and bug fixes can be shared between the two branches. We have a common codebase with two branches of developments for disparate target platforms.
And I have checked the Server Properties and Merge is enabled for C++ files. I have searched for an answer for this, but have only found problems related to encodings and/or XML.
0 kommentar(er)
