I tried checking out your dcb branch, and it's got a *ton* of
svn:mergeinfo on it. Sure, the simple "/trunk:2551-2575" info is
recorded on the root of the branch, but there's a bazillion other
ranges of revisions that have been merged into numerous subdirectories
(particularly in the test/selenium/ and apps/qubit/modules/ subdirs).
In the root of the dcb working copy, I ran a simple "svn merge
^/trunk", and immediately got a conflict on
web/vendor/yui/button/button-min.js. After a long wait, the merge was
successful for me:
--- Merging r1238 through r1425 into 'web/vendor/yui':
C web/vendor/yui/button/button-min.js
--- Merging r2576 through r2578 into '.':
U lib/model/QubitDigitalObject.php
Summary of conflicts:
Text conflicts: 1
In any case, svn's merge tracking is complex and fragile. I'm using
today's bleeding-edge (unreleased) svn 1.7 client code, and maybe it's
more robust in dealing with your repository's complexity. Endless
bug-fixes are always pouring into the merge-tracking intelligence.
At this point, I'd recommend two things:
1. Make sure you're using the latest client you can (1.6.2 is
latest), and try the merge again on a clean dcb checkout.
2. Ask for help on [email protected]. The merge-tracking
experts hang out there. Merge-tracking "smarts" is entirely in the
client, not the server, so it's *exceedingly* unlikely the problem has
anything to do with Googlecode's Subversion server. Occam's razor
points to Just Another Merge Tracking bug in the client which you may
or may not have uncovered (or some annoying limitation of the
feature.)
--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups
"Hosting at Google Code" group.
To post to this group, send email to [email protected]
To unsubscribe from this group, send email to
[email protected]
For more options, visit this group at
http://groups.google.com/group/google-code-hosting?hl=en
-~----------~----~----~----~------~----~------~--~---
