[Svnmerge] Question about usage with developer branches

[Jon Schewe]

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.

>svnmerge.py merge -b
property 'svnmerge-integrated' deleted from '.'.

property 'svnmerge-blocked' deleted from '.'.


property 'svnmerge-integrated' deleted from '.'.

property 'svnmerge-blocked' deleted from '.'.

 C   .

property 'svnmerge-integrated' set on '.'

property 'svnmerge-blocked' deleted from '.'.

jschewe at mn65-eggplant:~/projects/schedinfra/working-dir
>cat dir_conflicts.prej 
Trying to change property 'svnmerge-integrated' from '/trunk:1-6464' to
'/trunk:1-6470',
but the property does not
exist.jschewe at mn65-eggplant:~/projects/schedinfra/working-dir
>svn proplist -v
Properties on '.':

svnmerge-integrated : /branches/carciofi:1-6483 /branches/jpschewe:1-6466


________________________________________________________________________
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