Problems merging missed range

Hi, I tried to reintegrate branch, but svn said that some files in branch miss range from trunk. Tried to fix but range merge seems not working with urls. So I backed up branch, deleted it, created with the same name and overrode with backup. Committed branch, reintegrated, merged with record-only

Re: Help with constant conflicts

On Fri, May 13, 2011 at 4:35 PM, Stephen Butler wrote: > > On May 13, 2011, at 13:41 , K.L. wrote: > >> Hi, >> >> Having problems with merge. > > [...] > >> me@localhost /srv/www/svnbugs/branches/branch1 $ svn merge >> svn+ssh://example.com/var/svn

Help with constant conflicts

Hi, Having problems with merge. me@localhost /srv/www $ svn ls svn+ssh://example.com/var/svn/svnbugs me@localhost /srv/www $ svn mkdir svn+ssh://example.com/var/svn/svnbugs/trunk Log message unchanged or not specified (a)bort, (c)ontinue, (e)dit: c Committed revision 1. me@localhost /s