We are in dire need of help. We cannot merge from a subfolder in branch to trunk without errors. As a result our project has ground to a halt. All our latest development work is in branch but we cannot move it to trunk.
Our project is located at http://code.google.com/p/amped/source/browse/ We are currently using Tortoise SVN 1.6. Although at the time of the creation of the repository (Jan 2009) we were using version 1.5. I'm not sure if Google was using 1.5 yet then. Our current problem is that any merges from /branches/3.1/skin to trunk/skin result in all files showing as modified. Mergeinfo properties for all these files show Text Normal (except for the files that have actually changed), but Properties Modified. On the Text Normal Files, Diff shows no difference between the branch and trunk files. I tried committing one file from the merge as a test (I have not committed the full merge). Then I modified that test file in branch and tried to merge it again and got a conflict even thought the file in trunk has not changed. To give you some history: 1. We never used branches until recently. Then we needed to create a feature branch – branches/2.1 which was an exact copy of /trunk at that time. 2. We did not commit any further changes to /trunk – we only worked on branches/2.1 3. When the feature - branches/2.1 was completed, we merged it to / trunk using Merge Reintegrate 4. Then we renamed branches/2.1 to branches/3.0 5. When we released the latest version, branches/3.0 was renamed to / tags/Release 3.0 6. As we started work on verison 3.1, we created a new branches/3.1 which was an exact copy of /trunk 7. Next, we decided to add some new apps to SVN. Those were initally added separately from /trunk 8. However, we decided we wanted everything in /trunk and so we restructured /trunk to include new subfolders for the new apps. We also moved the existing files from /trunk to a subfolder /skin I believe this was done using Repo Browser. 9. Branches/3.1 was still using the old structure and Test Merges resulted in "skipped missing target" errors. So we restructured branches/3.1 to match the new /trunk structure. 10. Then I tried to merge a range of revisions from branches/3.1 to trunk/skin and that resulted in all versioned files showing as modified (Properties, text is normal except for those that have actually changed) Merge properties for the files in trunk/skin that show as modified in my last merge show: “s v n : m e r g e i n f o T /branches/2.1/common.dialog.xml: 402-635/ branches/3.1/skin/common.dialog.xml:707-730” We can merge successfully on other subfolders of /branch, just not on the /skin folder (which contains the major project files) I am at a loss what to do. Our branch has many changes in various states of development, some ready to merge to trunk, some not., some which will 'break' areas of the project until they are completed. Recommitting all these directly to /trunk or to a new branch if we have to create one will be considerable work. But if that is what we must do, now is better than later :). Since I do not understand where the problem lies I am not sure what solution will work. Can you explain what is the problem? What would you recommend to resolve this issue? 1. Create a new branch and recommit all changes 2. Do not use branch/merge in our project but commit all changes to / trunk 3. Delete and recreate the entire Project repository 4. Dump/load 5. Revert all changes/merges I should also point out that any merges from branch/skin to trunk/skin take about 20 minutes. However, we can merge succesfully from other branches in less than a minute. I have been trying to resolve this problem for three weeks now. Non of my 'experts' seem to be able to help, so I am getting desperate! I will gratefully appreciate any assistance you can provide. Doug Carson --~--~---------~--~----~------------~-------~--~----~ You received this message because you are subscribed to the Google Groups "Hosting at Google Code" group. To post to this group, send email to google-code-hosting@googlegroups.com To unsubscribe from this group, send email to google-code-hosting+unsubscr...@googlegroups.com For more options, visit this group at http://groups.google.com/group/google-code-hosting?hl=en -~----------~----~----~----~------~----~------~--~---
