[Svnmerge] problem merging changes from trunk

[Raman Gupta]

Jon Schewe wrote:
> So I made changes on my development branch.  Then used "svnmerge.py
> merge -b -S jpschewe" in the trunk to merge those changes into the
> trunk.  This went well.  I then committed my changes to the trunk.  I
> then proceeded to attempt a merge on my development branch to get any
> changes from the trunk "svnmerge.py merge".  This resulted in a number
> of conflicts that shouldn't have happened because nothing had actually
> happened on the trunk since I last pulled the trunk into my branch.
> Below is the output of the merge with -vv.  When I use "-b", I get no
> conflicts and in fact svnmerge does nothing.

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.

Cheers,
Raman Gupta