Re: Backporting changes in renamed files to 1.7

2013-05-10 Thread Paul Burba
On Fri, May 10, 2013 at 11:23 AM, Stefan Sperling wrote: > On Fri, May 10, 2013 at 04:14:36PM +0100, Philip Martin wrote: >> The 1.7 files >> >>subversion/svn/main.c >>subversion/svnserve/main.c >> >> were renamed in 1.8 to >> >>subversion/svn/svn.c >>subversion/svnserve/svnserve.c

Re: Backporting changes in renamed files to 1.7

2013-05-10 Thread Stefan Sperling
On Fri, May 10, 2013 at 04:14:36PM +0100, Philip Martin wrote: > The 1.7 files > >subversion/svn/main.c >subversion/svnserve/main.c > > were renamed in 1.8 to > >subversion/svn/svn.c >subversion/svnserve/svnserve.c > > and this causes conflicts when backporting changes from trun