[Svnmerge] problem using svnmerge

[golan davidovits]

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

-- 
Blair Zajac, Ph.D.
CTO, OrcaWare Technologies
<blair at orcaware.com>
Subversion training, consulting and support
http://www.orcaware.com/svn/


 
____________________________________________________________________________________
8:00? 8:25? 8:40? Find a flick in no time 
with the Yahoo! Search movie showtime shortcut.
http://tools.search.yahoo.com/shortcuts/#news