[Svnmerge] problem merging changes from trunk

[Raman Gupta]

Jon Schewe wrote:
> On Fri, 2007-08-24 at 01:00 -0400, Raman Gupta wrote:
>> I fail to see what the problem is... you got conflicts without -b,
>> which is expected. With -b, nothing happened, because there is nothing
>> on the trunk to merge... Seems perfectly fine to me.
>
> Oh, I was under the impression that -b was only required when merging
> changes from the development branches into the trunk because there are
> multiple sources.  I didn't think -b was supposed to be required when
> merging changes from the trunk back into a development branch.

Nope, any time you are merging from a branch that contains revisions
originating on the current branch, -b is required. It is an orthogonal
concept to multiple sources.

Cheers,
Raman