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
