[Svnmerge] Question about usage with developer branches

[Jon Schewe]

On Thu, 2007-08-16 at 14:23 -0400, Raman Gupta wrote:
> Jon Schewe wrote:
> > On Wed, 2007-08-15 at 21:03 -0400, Raman Gupta wrote:
> >> Jon Schewe wrote:
> >>> Trying to add new property 'svnmerge-integrated' with value 'xxx' but
> >>> property already exists with value 'yyy'
> >> Try the latest version in trunk, this problem should be fixed:
> >>
> >> http://svn.collab.net/repos/svn/trunk/contrib/client-side/svnmerge/svnmerge.py
> > 
> > Just tried it.  Same error.  Unless it's messed up from using the
> > previous version.  The following is merging changes from trunk into my
> > development branch.
> 
> Could you post the results of the same merge with -vv.

Doing that I realize that it's trying to merge from another developer
branch instead of the trunk.  What would cause that?

Also, should svnmerge be able to handle such merges?  Between branches
and between the trunk and a branch?


________________________________________________________________________
Jon Schewe | http://www.mtu.net/~jpschewe
If you see an attachment named signature.asc, this is my digital
signature.
See http://www.gnupg.org for more information.

For I am convinced that neither death nor life, neither angels 
nor demons, neither the present nor the future, nor any 
powers, neither height nor depth, nor anything else in all 
creation, will be able to separate us from the love of God that 
is in Christ Jesus our Lord. - Romans 8:38-39