Josh, I think the best thing is probably to just assume 1.4 has been merged to 1.5 already. Then, just bump up the number of acceptable renames in your config, and then do a recursive merge with the "ours" option (git merge -s recursive -X ours), so it favors the newer branch if there's a conflict. I'd still closely examine the changes as a result, to see if the non-conflicting changes were correct (if there are any... there probably shouldn't be, because it would almost certainly mean something was fixed in 1.4 but not in 1.5 or later). I haven't tried this yet... though.
Worst case scenario, we cleanly merge with the "git merge -s ours" strategy, which is basically a no-op merge that would keep the 1.5 branch as is. (similar to svn's --record-only merge option, I believe). -- Christopher L Tubbs II http://gravatar.com/ctubbsii On Sun, Jul 14, 2013 at 10:12 PM, Josh Elser <josh.el...@gmail.com> wrote: > Bad news about the 1.4 to 1.5 merge: there's a lot of conflicts to work > through (hundreds of conflicts). As we thought, this is likely due to the > removal of the extra 'src' dir in 1.4 and earlier. > > 1.5 to 1.6 (master) has a few conflicts but looks easy to resolve. > > I don't know enough about git-svn to say if there's a something we can do in > SVN land to make the merge better or not. IMO, it may be better to just bite > the bullet, resolve the conflicts in the merge, and just get on with our > lives using Git. > > I can volunteer to work through it, but I assume there will be more than one > case where I don't know the correct way to resolve the conflict. > > > On 07/13/2013 08:33 PM, Josh Elser wrote: >> >> For those not watching ticket, but yet care: >> >> https://git-wip-us.apache.org/repos/asf/accumulo.git >> https://git-wip-us.apache.org/repos/asf/accumulo-bsp.git >> https://git-wip-us.apache.org/repos/asf/accumulo-instamo-archetype.git >> https://git-wip-us.apache.org/repos/asf/accumulo-pig.git >> https://git-wip-us.apache.org/repos/asf/accumulo-wikisearch.git >> >> Please audit so we can get back to a r/w repo. >> >> PMC specifically, please take some time to verify the repos. >> >> On 06/13/2013 10:31 PM, Josh Elser wrote: >>> >>> https://issues.apache.org/jira/browse/INFRA-6392 >> >> >
