[Svnmerge] problem using svnmerge

[Blair Zajac]

That's not a lot to go on, as that's almost just the documentation :)

Can you reproduce it with a fresh repository?  Do you have a more 
detailed list of steps?

Which revision of svnmerge.py are you using the latest version of 
svnmerge.py?

Regards,
Blair

golan davidovits wrote:
> set up the branch: svnmerge.py init (or init -r 1-x)
> set up the trunk: svnmerge.py init branch_url (or init -r 1-x branch_url) 
> 
> merge: svnmerge.py merge -b -S branch_url (both sides)
> 
> 
> ----- Original Message ----
> From: Blair Zajac <blair at orcaware.com>
> To: golan davidovits <golandav at yahoo.com>
> Cc: svnmerge at orcaware.com
> Sent: Wednesday, February 28, 2007 10:35:23 AM
> Subject: Re: [Svnmerge] problem using svnmerge
> 
> 
> golan davidovits wrote:
>> Hello,
>>
>> I have a problem using svnmerge. after merging from trunk to branch i get a conflict that i resolve by choosing mine.
>> Then on the merge back to trunk i still get a conflict. This doesn't happen when using Tortoise.
>>
>> Please Advice,
>>
>> Thanks,
>> gzd
> 
> Can you give the exact commands you run to set up the branch, trunk and 
> use svnmerge?
> 
> Regards,
> Blair