> I'm having trouble subscribing. if there's a trick please let me know. I > sent mail to users-subscribe with just 'subscribe j...@zeevee.com' in the > body.... no answer.
You are sending an email to users-subscr...@subversion.apache.org ? No subject no body? > We use a lot of project branches, that is, we branch from trunk, > develop a feature and then merge it back to trunk. Quite often, we need > to merge a change or two from trunk out to our branch along the way. > What I have noticed is that when I go to merge the branch back to trunk, > the changes that were merged from trunk to the branch are included when > I do a 'svn mergeinfo --show-revs eligible <branchname> <trunk>'. Why is > this? Shouldn't the system know that these were merged out and therefore > do not need to be merged in? I do not ever use 'ignore-ancestry'. > > I end up doing a lot of 'svn merge --record-only's to block the reverse > merges. If you have a feature branch you should be merging from trunk into the branch regularly. then when you are done with the feature you would do a reintegrate merge back. I don't see an argument on merginfo to specify that you want to do a re-integrate. BOb
