Community
Participate
Working Groups
Build Identifier: 20110218-0911 When trying to merge (e.g. Branch -> Trunk) i would like to select the Files i want to merge. Subversive merges all nonconflicting Files automatically. That's very annoying. Reproducible: Always Steps to Reproduce: 1. Create a Branch 2. Do some Programming in Branch 3. Try to merge it Back to Trunk
Created attachment 196191 [details] Screen shot of Subversive Merge dialog with selection of revisions displayed Here you see the "Merge Dialog" of Subversive. You can select revisions by hand and even using a quite comfortable browser dialog (with filtering on name, comment etc.)
Otherwise, please elaborate what actions step 3 in descriptions includes, e.g. which buttons you press or dialogs you are opening.
When you're merging something into your code, you should get consistent changes and that is why we have transactions and commits becoming consistent revisions. This means that the minimal merge management unit is a revision and that is how Subversion works. There is no way to specify files while merging 2 URLs. It probably could be done by iteratively performing merge over each selected file, but this is plain wrong when you're using Subversion merge: 1) you will get some hard "merge tracking spam" instead of normal merge tracking records 2) the reason merge tracking was introduced is to avoid unnecessary conflicts and changes for repetitive merges, when you exclude some files from merge process they will not be recorded as merged and will reappear in each and every following merge. So, you may ask what is the way to exclude unneeded changes? The answer is simple: just for this you have the 'Merge View' feature, that allows you to review merged resources, revert unneeded changes, make manual corrections and solve conflicts. If you do it this way, you will not get into serious troubles like reappearing changes and conflicts, mistakingly skipping some important changes etc.
Sorry, I misread the description as selecting revisions not files.
