> -----Original Message----- > From: Daniel Shahaf [mailto:danie...@elego.de] > Sent: Saturday, 25 February, 2012 1:40 PM > To: Joel Low > Cc: users@subversion.apache.org > Subject: Re: Cannot merge into mixed-revision working copy > > Joel Low wrote on Sat, Feb 25, 2012 at 13:17:20 +0800: > > Hi Daniel, > > > > > -----Original Message----- > > > From: Daniel Shahaf [mailto:danie...@elego.de] > > > Sent: Saturday, 25 February, 2012 12:38 PM > > > To: Joel Low > > > Cc: users@subversion.apache.org > > > Subject: Re: Cannot merge into mixed-revision working copy > > > > > > Daniel Shahaf wrote on Sat, Feb 25, 2012 at 06:08:17 +0200: > > > > --allow-mixed-revisions, > > > > > > (This is an argument to 'svn merge'.) > > > > > > > but the code shouldn't care about the revision of the external > for > > > the > > > > purposes of this check. > > > > > > > > Can you provide a reproduction recipe, starting from an empty > > > > repository? In a quick test I couldn't trigger the error you > > > describe. > > > > > > > > http://subversion.apache.org/docs/community- > guide/issues#reporting > > > > - > > > bug > > > > s > > I'll try to make a repro case: it may very well be a corrupt WC since > this WC has been around since 1.7 was under dev status. If it is of any > significance, however, the external is from within the same repository, > which could be the reason behind the confusion. > > > > Still can't reproduce it: > > % ./new.sh >/dev/null > % cd wc1 > % $svn cp -q trunk branch > % $svn ps -q k v branch > % $svn ci -q -m r3 > % $svn ps -q svn:externals '^/branch branch' trunk % $svn ci -q -m r4 % > $svn up -q % $svnversion trunk > 4 > % $svn up -q -r3 trunk/iota > % $svnversion trunk > 3:4 > % $svn up -q -r3 trunk/A > % $svnversion trunk > 3:4 > % $svn up -q -r3 --depth=empty trunk > % $svnversion trunk > 3 > % $svn merge -c r3 ^/branch trunk > --- Merging r3 into 'trunk': > U trunk > --- Recording mergeinfo for merge of r3 into 'trunk': > U trunk > % $svnversion trunk/branch > 4 > % $svnversion trunk > 3M > % > > Here, $svn points to a trunk@HEAD build, and new.sh creates a > repository with one revision and the following contents: > > trunk/ > trunk/A/ > trunk/A/B/ > trunk/A/B/lambda > trunk/A/B/E/ > trunk/A/B/E/alpha > trunk/A/B/E/beta > trunk/A/B/F/ > trunk/A/mu > trunk/A/C/ > trunk/A/D/ > trunk/A/D/gamma > trunk/A/D/G/ > trunk/A/D/G/pi > trunk/A/D/G/rho > trunk/A/D/G/tau > trunk/A/D/H/ > trunk/A/D/H/chi > trunk/A/D/H/omega > trunk/A/D/H/psi > trunk/iota > branches/ > tags/ > > > > > > > > > Thanks > > > > > > > > Daniel > > > > > >
I've spent quite a bit of time trying to come up with a reproducible scenario but I can't come up with anything (similar to what you came up with, as close as I could with my set up). I do note that running svnversion yields 926:1307MS, even after running svn update and svn st doesn't show modified files, so I've just trashed the working copy and did a fresh checkout. I'll just assume that my WC was corrupt -- I'll try the merge and come back to this thread again if there are any further problems. Thanks for your help Daniel! Joel
