On 06/06/2011 02:00 PM, jerry DeLisle wrote:
This whole thing has me puzzled. The branch was created before go and
libgo existed on trunk. Then I did a plain vanilla merge and got a
whole bunch of tree conflicts just for those two directories. Then I
attempted to manually resolve those tree conflicts. So Tobias
question remains open.
Since yesterday after HJ fixed up, I deleted the whole local
fortran-dev branch and did a clean checkout of fortran-dev. I have
now done another plain vanilla merge of trunk into my local
fortran-dev and again I get tree conflicts for go and libgo. I have
proceeded to one by one resolve these by copying over the current
trunk file. In some cases I have to do an svn add, other places I
have to do svn resolve.
My impression is that such issues often occurs if one merges a branch
into a trunk (as opposed to only merging the trunk into branches).
For instance, one has (older fortran-dev checkout):
$ svn pg svn:mergeinfo
/branches/cxx0x-lambdas-branch:136126-152315
/trunk:130803-130804,144975-163757
I wouldn't be surprised if the "/branches/cxx0x-lambdas-branch" causes
the libstdc++v3 merge issues. Nor would me surprise if the current
version has a "go" branch.
(I don't know svn merge well enough to solve or properly diagnose such
issues.)
Tobias
