Community
Participate
Working Groups
Build Identifier: 20110218-091 We have made a branch/tag of the actuall productive Product and we are continuing development in the trunk. After some Bugfixes, we wanted to merge the changes to trunk. After a long time, Team Synchronisation View shows me files that should be untouched. When i doubleclick on a file the Compare Editor opens and shows not a single difference. The Remote File (from Branch) has the same Revision like the File in the Trunk. We are working with Working Sets. All the Projects we wanted to merge are from the same repository. Reproducible: Always Steps to Reproduce: 1. create working set 2. checkout projects into working set 3. create branch of working set 4. create new workspace and checkout branch 4. commit changes from second workspace to branch and changes from first workspace to trunk 5. try to merge branch into trunk workspace onto the working set our rcp projects are huge. maybe this ist the problem!
There could be another problems: - these files could contains changes in the whitespace characters (space at the end of lines, tabs instead of spaces or spaces instead of tabs etc.) and compare editor could not show differences in that case depending on its preferences. - changes in the file properties - in this case you could see changes only through property compare editor. - are you trying to merge changes, that are already present in the destination (without merge tracking it's guaranteed to produce conflicts without actual changes, and with merge tracking... well, so so...)? Also if all this is not the case, then information you have provided is still not enough. My daily work consists of managing tens of branches and tags and I perform merges almost every day without any troubles or issues (amount of resources is several thousands and amount of merged changes is up to several hundreds). So, if you still think there is an issue with merging, then please provide more information: - Subversive and Subversive connectors versions - which one connector is used: SVN Kit 1.2.3, SVN Kit 1.3.5, JavaHL 1.5.4 or JavaHL 1.6.12 - SVN server version - do you use SVN merge tracking feature or not (depends on server version and repository configuration)? And as I mentioned before, provided steps to reproduce unfortunately is not a steps to reproduce at all (I do this every day without any troubles for years).
Still no information. In any case Subversive just displays the statuses reported by an external SVN support library (be it JavaHL or SVN Kit) and I want to believe that both client libraries works fine in that case. So, if there are some useful information I could file the report to the client library tracker in question. As for this report I will close it as "works for me".
