On Mon, Jun 6, 2011 at 12:14 PM, Tobias Burnus <bur...@net-b.de> wrote: > On 06/06/2011 11:47 AM, Richard Guenther wrote: >>> >>> Looks like an accident, modifying both trunk and branches/fortran-dev. >>> But the git mirror splits it between the trunk and fortran-dev branches. >> >> Jerry, can you fix it up please? > > This has been fixed else thread (cf. "Strange commit from fortran-dev > branch") by HJ's commit: http://gcc.gnu.org/ml/gcc-cvs/2011-06/msg00150.html > > (The question are: Why does "svn merge" produce merge errors for > directories/files untouched in the branch? libgo was never modified in > "fortran-dev" and should thus match the trunk to 100%. I also do not quite > understand how a merge of the trunk into a branch via "svn merge; svn > commit" can create files in the trunk.)
You probably didn't branch the whole tree on fortran-dev? This way you have a partial branch/trunk checkout and I guess svn merge is just confused when you merge from trunk to trunk. So, don't branch in a way that a checkout produces a mix of branch/trunk. Richard. > Tobias >
