You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@accumulo.apache.org by Josh Elser <jo...@gmail.com> on 2013/06/14 04:31:01 UTC
SVN to GIt INFRA ticket submitted
https://issues.apache.org/jira/browse/INFRA-6392
Re: SVN to GIt INFRA ticket submitted
Posted by Josh Elser <jo...@gmail.com>.
I consider the consensus of all parties who have actually helped out so
far as adequate PMC consensus (given we've had about 3 days since last
INFRA update).
I'll send another note here when I hear back from INFRA.
On 7/15/13 11:54 AM, Keith Turner wrote:
> On Mon, Jul 15, 2013 at 10:54 AM, Josh Elser <jo...@gmail.com> wrote:
>
>> Is the consensus then to inform INFRA that we can finalize the transition
>> and get back to r/w?
>>
>
> I am ok with that. I can just patch in the changes for ACCUMULO-1000
>
>
>>
>> Is anyone still actively inspecting things? I'll wait a bit before
>> responding on the ticket to be sure (probably won't get finished until
>> later tonight which is purely a guess on the last time of actions though).
>>
>>
>> On 7/15/13 10:42 AM, Keith Turner wrote:
>>
>>> I diffed all of the other branches and everything except for ACCUMULO-1000
>>> is ok.
>>>
>>> To make diffing easy I found that using svn export and deleting all empty
>>> dirs minimizes the diff to just the .git file. You have to delete empty
>>> dir multiple times, because if deleting an empty dir makes the parent
>>> empty
>>> then the parent needs to be deleted.
>>>
>>>
>>> On Sun, Jul 14, 2013 at 11:40 AM, John Vines <vi...@apache.org> wrote:
>>>
>>> The last commit to trunk, Christopher's addition of the maven plugin
>>>> stuff,
>>>> is there in git, so that seems in sync. I'm wondering if the
>>>> Accumulo-1000
>>>> stuff came in a little bit too close to when things got frozen that the
>>>> mirror didn't pick it up yet.
>>>>
>>>>
>>>> On Sun, Jul 14, 2013 at 11:03 AM, Josh Elser <jo...@gmail.com>
>>>> wrote:
>>>>
>>>> Yes that is likely to be the case but this is what happens in this
>>>>> situation. Please comment on the infra ticket to see if they can resync
>>>>> against svn in such a way to avoid this again.
>>>>> On Jul 14, 2013 10:06 AM, "Keith Turner" <ke...@deenlo.com> wrote:
>>>>>
>>>>> On Sat, Jul 13, 2013 at 9:00 PM, John Vines <vi...@apache.org> wrote:
>>>>>>
>>>>>> Did a diff of all (trunk) files for all repos and the only differences
>>>>>>>
>>>>>> are
>>>>>>
>>>>>>> the absence of .svn and the addition of .git files. That's a good
>>>>>>>
>>>>>> start.
>>>>
>>>>>
>>>>>>>
>>>>>>>
>>>>>>> We should probably diff all of the branches. The ACCUMULO-1000
>>>>>> branch I
>>>>>> created Fri seems out of sync. I put a comment on the ticket. But I
>>>>>>
>>>>> am
>>>>
>>>>> not sure if I am doing something wrong w/ git.
>>>>>>
>>>>>>
>>>>>> On Sat, Jul 13, 2013 at 8:33 PM, Josh Elser <jo...@gmail.com>
>>>>>>>
>>>>>> 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.git>
>>>>>>>> <
>>>>>>>>
>>>>>>> https://git-wip-us.apache.org/**repos/asf/accumulo.git<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-bsp.git>
>>>>>>>> <
>>>>>>>>
>>>>>>> https://git-wip-us.apache.org/**repos/asf/accumulo-bsp.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-instamo-**archetype.git>
>>>>
>>>>> <
>>>>>>>
>>>>>> https://git-wip-us.apache.org/**repos/asf/accumulo-instamo-**
>>>> archetype.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-pig.git>
>>>>>>>> <
>>>>>>>>
>>>>>>> https://git-wip-us.apache.org/**repos/asf/accumulo-pig.git<https://git-wip-us.apache.org/repos/asf/accumulo-pig.git>
>>>>>>>>
>>>>>>>
>>>>>>>> https://git-wip-us.apache.org/****repos/asf/accumulo-**
>>>>>>>> wikisearch.**git<https://git-wip-us.apache.org/**repos/asf/accumulo-wikisearch.**git>
>>>>>>>>
>>>>>>> <
>>>>
>>>>> https://git-wip-us.apache.org/**repos/asf/accumulo-wikisearch.**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<https://issues.apache.org/**jira/browse/INFRA-6392>
>>>>>>>>> <
>>>>>>>>>
>>>>>>>> https://issues.apache.org/**jira/browse/INFRA-6392<https://issues.apache.org/jira/browse/INFRA-6392>
>>>>>>>>
>>>>>>>
>>>>>>>>
>>>>>>>>>
>>>>>>>>
>>>>>>>>
>>>>>>>
>>>>>>
>>>>>
>>>>
>>>
>
Re: SVN to GIt INFRA ticket submitted
Posted by Keith Turner <ke...@deenlo.com>.
On Mon, Jul 15, 2013 at 10:54 AM, Josh Elser <jo...@gmail.com> wrote:
> Is the consensus then to inform INFRA that we can finalize the transition
> and get back to r/w?
>
I am ok with that. I can just patch in the changes for ACCUMULO-1000
>
> Is anyone still actively inspecting things? I'll wait a bit before
> responding on the ticket to be sure (probably won't get finished until
> later tonight which is purely a guess on the last time of actions though).
>
>
> On 7/15/13 10:42 AM, Keith Turner wrote:
>
>> I diffed all of the other branches and everything except for ACCUMULO-1000
>> is ok.
>>
>> To make diffing easy I found that using svn export and deleting all empty
>> dirs minimizes the diff to just the .git file. You have to delete empty
>> dir multiple times, because if deleting an empty dir makes the parent
>> empty
>> then the parent needs to be deleted.
>>
>>
>> On Sun, Jul 14, 2013 at 11:40 AM, John Vines <vi...@apache.org> wrote:
>>
>> The last commit to trunk, Christopher's addition of the maven plugin
>>> stuff,
>>> is there in git, so that seems in sync. I'm wondering if the
>>> Accumulo-1000
>>> stuff came in a little bit too close to when things got frozen that the
>>> mirror didn't pick it up yet.
>>>
>>>
>>> On Sun, Jul 14, 2013 at 11:03 AM, Josh Elser <jo...@gmail.com>
>>> wrote:
>>>
>>> Yes that is likely to be the case but this is what happens in this
>>>> situation. Please comment on the infra ticket to see if they can resync
>>>> against svn in such a way to avoid this again.
>>>> On Jul 14, 2013 10:06 AM, "Keith Turner" <ke...@deenlo.com> wrote:
>>>>
>>>> On Sat, Jul 13, 2013 at 9:00 PM, John Vines <vi...@apache.org> wrote:
>>>>>
>>>>> Did a diff of all (trunk) files for all repos and the only differences
>>>>>>
>>>>> are
>>>>>
>>>>>> the absence of .svn and the addition of .git files. That's a good
>>>>>>
>>>>> start.
>>>
>>>>
>>>>>>
>>>>>>
>>>>>> We should probably diff all of the branches. The ACCUMULO-1000
>>>>> branch I
>>>>> created Fri seems out of sync. I put a comment on the ticket. But I
>>>>>
>>>> am
>>>
>>>> not sure if I am doing something wrong w/ git.
>>>>>
>>>>>
>>>>> On Sat, Jul 13, 2013 at 8:33 PM, Josh Elser <jo...@gmail.com>
>>>>>>
>>>>> 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.git>
>>>>>>> <
>>>>>>>
>>>>>> https://git-wip-us.apache.org/**repos/asf/accumulo.git<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-bsp.git>
>>>>>>> <
>>>>>>>
>>>>>> https://git-wip-us.apache.org/**repos/asf/accumulo-bsp.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-instamo-**archetype.git>
>>>
>>>> <
>>>>>>
>>>>> https://git-wip-us.apache.org/**repos/asf/accumulo-instamo-**
>>> archetype.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-pig.git>
>>>>>>> <
>>>>>>>
>>>>>> https://git-wip-us.apache.org/**repos/asf/accumulo-pig.git<https://git-wip-us.apache.org/repos/asf/accumulo-pig.git>
>>>>>> >
>>>>>>
>>>>>>> https://git-wip-us.apache.org/****repos/asf/accumulo-**
>>>>>>> wikisearch.**git<https://git-wip-us.apache.org/**repos/asf/accumulo-wikisearch.**git>
>>>>>>>
>>>>>> <
>>>
>>>> https://git-wip-us.apache.org/**repos/asf/accumulo-wikisearch.**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<https://issues.apache.org/**jira/browse/INFRA-6392>
>>>>>>>> <
>>>>>>>>
>>>>>>> https://issues.apache.org/**jira/browse/INFRA-6392<https://issues.apache.org/jira/browse/INFRA-6392>
>>>>>> >
>>>>>>
>>>>>>>
>>>>>>>>
>>>>>>>
>>>>>>>
>>>>>>
>>>>>
>>>>
>>>
>>
Re: SVN to GIt INFRA ticket submitted
Posted by Eric Newton <er...@gmail.com>.
I checked trunk, too. It all looks good to me. I'll just patch over my
outstanding changes and begin using git.
-Eric
On Mon, Jul 15, 2013 at 10:54 AM, Josh Elser <jo...@gmail.com> wrote:
> Is the consensus then to inform INFRA that we can finalize the transition
> and get back to r/w?
>
> Is anyone still actively inspecting things? I'll wait a bit before
> responding on the ticket to be sure (probably won't get finished until
> later tonight which is purely a guess on the last time of actions though).
>
>
> On 7/15/13 10:42 AM, Keith Turner wrote:
>
>> I diffed all of the other branches and everything except for ACCUMULO-1000
>> is ok.
>>
>> To make diffing easy I found that using svn export and deleting all empty
>> dirs minimizes the diff to just the .git file. You have to delete empty
>> dir multiple times, because if deleting an empty dir makes the parent
>> empty
>> then the parent needs to be deleted.
>>
>>
>> On Sun, Jul 14, 2013 at 11:40 AM, John Vines <vi...@apache.org> wrote:
>>
>> The last commit to trunk, Christopher's addition of the maven plugin
>>> stuff,
>>> is there in git, so that seems in sync. I'm wondering if the
>>> Accumulo-1000
>>> stuff came in a little bit too close to when things got frozen that the
>>> mirror didn't pick it up yet.
>>>
>>>
>>> On Sun, Jul 14, 2013 at 11:03 AM, Josh Elser <jo...@gmail.com>
>>> wrote:
>>>
>>> Yes that is likely to be the case but this is what happens in this
>>>> situation. Please comment on the infra ticket to see if they can resync
>>>> against svn in such a way to avoid this again.
>>>> On Jul 14, 2013 10:06 AM, "Keith Turner" <ke...@deenlo.com> wrote:
>>>>
>>>> On Sat, Jul 13, 2013 at 9:00 PM, John Vines <vi...@apache.org> wrote:
>>>>>
>>>>> Did a diff of all (trunk) files for all repos and the only differences
>>>>>>
>>>>> are
>>>>>
>>>>>> the absence of .svn and the addition of .git files. That's a good
>>>>>>
>>>>> start.
>>>
>>>>
>>>>>>
>>>>>>
>>>>>> We should probably diff all of the branches. The ACCUMULO-1000
>>>>> branch I
>>>>> created Fri seems out of sync. I put a comment on the ticket. But I
>>>>>
>>>> am
>>>
>>>> not sure if I am doing something wrong w/ git.
>>>>>
>>>>>
>>>>> On Sat, Jul 13, 2013 at 8:33 PM, Josh Elser <jo...@gmail.com>
>>>>>>
>>>>> 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.git>
>>>>>>> <
>>>>>>>
>>>>>> https://git-wip-us.apache.org/**repos/asf/accumulo.git<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-bsp.git>
>>>>>>> <
>>>>>>>
>>>>>> https://git-wip-us.apache.org/**repos/asf/accumulo-bsp.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-instamo-**archetype.git>
>>>
>>>> <
>>>>>>
>>>>> https://git-wip-us.apache.org/**repos/asf/accumulo-instamo-**
>>> archetype.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-pig.git>
>>>>>>> <
>>>>>>>
>>>>>> https://git-wip-us.apache.org/**repos/asf/accumulo-pig.git<https://git-wip-us.apache.org/repos/asf/accumulo-pig.git>
>>>>>> >
>>>>>>
>>>>>>> https://git-wip-us.apache.org/****repos/asf/accumulo-**
>>>>>>> wikisearch.**git<https://git-wip-us.apache.org/**repos/asf/accumulo-wikisearch.**git>
>>>>>>>
>>>>>> <
>>>
>>>> https://git-wip-us.apache.org/**repos/asf/accumulo-wikisearch.**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<https://issues.apache.org/**jira/browse/INFRA-6392>
>>>>>>>> <
>>>>>>>>
>>>>>>> https://issues.apache.org/**jira/browse/INFRA-6392<https://issues.apache.org/jira/browse/INFRA-6392>
>>>>>> >
>>>>>>
>>>>>>>
>>>>>>>>
>>>>>>>
>>>>>>>
>>>>>>
>>>>>
>>>>
>>>
>>
Re: SVN to GIt INFRA ticket submitted
Posted by John Vines <vi...@apache.org>.
I am ready to make the transition
On Mon, Jul 15, 2013 at 10:54 AM, Josh Elser <jo...@gmail.com> wrote:
> Is the consensus then to inform INFRA that we can finalize the transition
> and get back to r/w?
>
> Is anyone still actively inspecting things? I'll wait a bit before
> responding on the ticket to be sure (probably won't get finished until
> later tonight which is purely a guess on the last time of actions though).
>
>
> On 7/15/13 10:42 AM, Keith Turner wrote:
>
>> I diffed all of the other branches and everything except for ACCUMULO-1000
>> is ok.
>>
>> To make diffing easy I found that using svn export and deleting all empty
>> dirs minimizes the diff to just the .git file. You have to delete empty
>> dir multiple times, because if deleting an empty dir makes the parent
>> empty
>> then the parent needs to be deleted.
>>
>>
>> On Sun, Jul 14, 2013 at 11:40 AM, John Vines <vi...@apache.org> wrote:
>>
>> The last commit to trunk, Christopher's addition of the maven plugin
>>> stuff,
>>> is there in git, so that seems in sync. I'm wondering if the
>>> Accumulo-1000
>>> stuff came in a little bit too close to when things got frozen that the
>>> mirror didn't pick it up yet.
>>>
>>>
>>> On Sun, Jul 14, 2013 at 11:03 AM, Josh Elser <jo...@gmail.com>
>>> wrote:
>>>
>>> Yes that is likely to be the case but this is what happens in this
>>>> situation. Please comment on the infra ticket to see if they can resync
>>>> against svn in such a way to avoid this again.
>>>> On Jul 14, 2013 10:06 AM, "Keith Turner" <ke...@deenlo.com> wrote:
>>>>
>>>> On Sat, Jul 13, 2013 at 9:00 PM, John Vines <vi...@apache.org> wrote:
>>>>>
>>>>> Did a diff of all (trunk) files for all repos and the only differences
>>>>>>
>>>>> are
>>>>>
>>>>>> the absence of .svn and the addition of .git files. That's a good
>>>>>>
>>>>> start.
>>>
>>>>
>>>>>>
>>>>>>
>>>>>> We should probably diff all of the branches. The ACCUMULO-1000
>>>>> branch I
>>>>> created Fri seems out of sync. I put a comment on the ticket. But I
>>>>>
>>>> am
>>>
>>>> not sure if I am doing something wrong w/ git.
>>>>>
>>>>>
>>>>> On Sat, Jul 13, 2013 at 8:33 PM, Josh Elser <jo...@gmail.com>
>>>>>>
>>>>> 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.git>
>>>>>>> <
>>>>>>>
>>>>>> https://git-wip-us.apache.org/**repos/asf/accumulo.git<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-bsp.git>
>>>>>>> <
>>>>>>>
>>>>>> https://git-wip-us.apache.org/**repos/asf/accumulo-bsp.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-instamo-**archetype.git>
>>>
>>>> <
>>>>>>
>>>>> https://git-wip-us.apache.org/**repos/asf/accumulo-instamo-**
>>> archetype.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-pig.git>
>>>>>>> <
>>>>>>>
>>>>>> https://git-wip-us.apache.org/**repos/asf/accumulo-pig.git<https://git-wip-us.apache.org/repos/asf/accumulo-pig.git>
>>>>>> >
>>>>>>
>>>>>>> https://git-wip-us.apache.org/****repos/asf/accumulo-**
>>>>>>> wikisearch.**git<https://git-wip-us.apache.org/**repos/asf/accumulo-wikisearch.**git>
>>>>>>>
>>>>>> <
>>>
>>>> https://git-wip-us.apache.org/**repos/asf/accumulo-wikisearch.**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<https://issues.apache.org/**jira/browse/INFRA-6392>
>>>>>>>> <
>>>>>>>>
>>>>>>> https://issues.apache.org/**jira/browse/INFRA-6392<https://issues.apache.org/jira/browse/INFRA-6392>
>>>>>> >
>>>>>>
>>>>>>>
>>>>>>>>
>>>>>>>
>>>>>>>
>>>>>>
>>>>>
>>>>
>>>
>>
Re: SVN to GIt INFRA ticket submitted
Posted by Josh Elser <jo...@gmail.com>.
Is the consensus then to inform INFRA that we can finalize the
transition and get back to r/w?
Is anyone still actively inspecting things? I'll wait a bit before
responding on the ticket to be sure (probably won't get finished until
later tonight which is purely a guess on the last time of actions though).
On 7/15/13 10:42 AM, Keith Turner wrote:
> I diffed all of the other branches and everything except for ACCUMULO-1000
> is ok.
>
> To make diffing easy I found that using svn export and deleting all empty
> dirs minimizes the diff to just the .git file. You have to delete empty
> dir multiple times, because if deleting an empty dir makes the parent empty
> then the parent needs to be deleted.
>
>
> On Sun, Jul 14, 2013 at 11:40 AM, John Vines <vi...@apache.org> wrote:
>
>> The last commit to trunk, Christopher's addition of the maven plugin stuff,
>> is there in git, so that seems in sync. I'm wondering if the Accumulo-1000
>> stuff came in a little bit too close to when things got frozen that the
>> mirror didn't pick it up yet.
>>
>>
>> On Sun, Jul 14, 2013 at 11:03 AM, Josh Elser <jo...@gmail.com> wrote:
>>
>>> Yes that is likely to be the case but this is what happens in this
>>> situation. Please comment on the infra ticket to see if they can resync
>>> against svn in such a way to avoid this again.
>>> On Jul 14, 2013 10:06 AM, "Keith Turner" <ke...@deenlo.com> wrote:
>>>
>>>> On Sat, Jul 13, 2013 at 9:00 PM, John Vines <vi...@apache.org> wrote:
>>>>
>>>>> Did a diff of all (trunk) files for all repos and the only differences
>>>> are
>>>>> the absence of .svn and the addition of .git files. That's a good
>> start.
>>>>>
>>>>>
>>>>>
>>>> We should probably diff all of the branches. The ACCUMULO-1000 branch I
>>>> created Fri seems out of sync. I put a comment on the ticket. But I
>> am
>>>> not sure if I am doing something wrong w/ git.
>>>>
>>>>
>>>>> On Sat, Jul 13, 2013 at 8:33 PM, Josh Elser <jo...@gmail.com>
>>>> 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.git>
>>>>>> https://git-wip-us.apache.org/**repos/asf/accumulo-bsp.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-instamo-archetype.git
>>>>>
>>>>>> https://git-wip-us.apache.org/**repos/asf/accumulo-pig.git<
>>>>> https://git-wip-us.apache.org/repos/asf/accumulo-pig.git>
>>>>>> https://git-wip-us.apache.org/**repos/asf/accumulo-wikisearch.**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<
>>>>> https://issues.apache.org/jira/browse/INFRA-6392>
>>>>>>>
>>>>>>
>>>>>>
>>>>>
>>>>
>>>
>>
>
Re: SVN to GIt INFRA ticket submitted
Posted by Keith Turner <ke...@deenlo.com>.
I diffed all of the other branches and everything except for ACCUMULO-1000
is ok.
To make diffing easy I found that using svn export and deleting all empty
dirs minimizes the diff to just the .git file. You have to delete empty
dir multiple times, because if deleting an empty dir makes the parent empty
then the parent needs to be deleted.
On Sun, Jul 14, 2013 at 11:40 AM, John Vines <vi...@apache.org> wrote:
> The last commit to trunk, Christopher's addition of the maven plugin stuff,
> is there in git, so that seems in sync. I'm wondering if the Accumulo-1000
> stuff came in a little bit too close to when things got frozen that the
> mirror didn't pick it up yet.
>
>
> On Sun, Jul 14, 2013 at 11:03 AM, Josh Elser <jo...@gmail.com> wrote:
>
> > Yes that is likely to be the case but this is what happens in this
> > situation. Please comment on the infra ticket to see if they can resync
> > against svn in such a way to avoid this again.
> > On Jul 14, 2013 10:06 AM, "Keith Turner" <ke...@deenlo.com> wrote:
> >
> >> On Sat, Jul 13, 2013 at 9:00 PM, John Vines <vi...@apache.org> wrote:
> >>
> >> > Did a diff of all (trunk) files for all repos and the only differences
> >> are
> >> > the absence of .svn and the addition of .git files. That's a good
> start.
> >> >
> >> >
> >> >
> >> We should probably diff all of the branches. The ACCUMULO-1000 branch I
> >> created Fri seems out of sync. I put a comment on the ticket. But I
> am
> >> not sure if I am doing something wrong w/ git.
> >>
> >>
> >> > On Sat, Jul 13, 2013 at 8:33 PM, Josh Elser <jo...@gmail.com>
> >> 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.git>
> >> > > https://git-wip-us.apache.org/**repos/asf/accumulo-bsp.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-instamo-archetype.git
> >> >
> >> > > https://git-wip-us.apache.org/**repos/asf/accumulo-pig.git<
> >> > https://git-wip-us.apache.org/repos/asf/accumulo-pig.git>
> >> > > https://git-wip-us.apache.org/**repos/asf/accumulo-wikisearch.**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<
> >> > https://issues.apache.org/jira/browse/INFRA-6392>
> >> > >>
> >> > >
> >> > >
> >> >
> >>
> >
>
Re: SVN to GIt INFRA ticket submitted
Posted by John Vines <vi...@apache.org>.
The last commit to trunk, Christopher's addition of the maven plugin stuff,
is there in git, so that seems in sync. I'm wondering if the Accumulo-1000
stuff came in a little bit too close to when things got frozen that the
mirror didn't pick it up yet.
On Sun, Jul 14, 2013 at 11:03 AM, Josh Elser <jo...@gmail.com> wrote:
> Yes that is likely to be the case but this is what happens in this
> situation. Please comment on the infra ticket to see if they can resync
> against svn in such a way to avoid this again.
> On Jul 14, 2013 10:06 AM, "Keith Turner" <ke...@deenlo.com> wrote:
>
>> On Sat, Jul 13, 2013 at 9:00 PM, John Vines <vi...@apache.org> wrote:
>>
>> > Did a diff of all (trunk) files for all repos and the only differences
>> are
>> > the absence of .svn and the addition of .git files. That's a good start.
>> >
>> >
>> >
>> We should probably diff all of the branches. The ACCUMULO-1000 branch I
>> created Fri seems out of sync. I put a comment on the ticket. But I am
>> not sure if I am doing something wrong w/ git.
>>
>>
>> > On Sat, Jul 13, 2013 at 8:33 PM, Josh Elser <jo...@gmail.com>
>> 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.git>
>> > > https://git-wip-us.apache.org/**repos/asf/accumulo-bsp.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-instamo-archetype.git
>> >
>> > > https://git-wip-us.apache.org/**repos/asf/accumulo-pig.git<
>> > https://git-wip-us.apache.org/repos/asf/accumulo-pig.git>
>> > > https://git-wip-us.apache.org/**repos/asf/accumulo-wikisearch.**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<
>> > https://issues.apache.org/jira/browse/INFRA-6392>
>> > >>
>> > >
>> > >
>> >
>>
>
Re: SVN to GIt INFRA ticket submitted
Posted by Josh Elser <jo...@gmail.com>.
Yes that is likely to be the case but this is what happens in this
situation. Please comment on the infra ticket to see if they can resync
against svn in such a way to avoid this again.
On Jul 14, 2013 10:06 AM, "Keith Turner" <ke...@deenlo.com> wrote:
> On Sat, Jul 13, 2013 at 9:00 PM, John Vines <vi...@apache.org> wrote:
>
> > Did a diff of all (trunk) files for all repos and the only differences
> are
> > the absence of .svn and the addition of .git files. That's a good start.
> >
> >
> >
> We should probably diff all of the branches. The ACCUMULO-1000 branch I
> created Fri seems out of sync. I put a comment on the ticket. But I am
> not sure if I am doing something wrong w/ git.
>
>
> > On Sat, Jul 13, 2013 at 8:33 PM, Josh Elser <jo...@gmail.com>
> 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.git>
> > > https://git-wip-us.apache.org/**repos/asf/accumulo-bsp.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-instamo-archetype.git>
> > > https://git-wip-us.apache.org/**repos/asf/accumulo-pig.git<
> > https://git-wip-us.apache.org/repos/asf/accumulo-pig.git>
> > > https://git-wip-us.apache.org/**repos/asf/accumulo-wikisearch.**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<
> > https://issues.apache.org/jira/browse/INFRA-6392>
> > >>
> > >
> > >
> >
>
Re: SVN to GIt INFRA ticket submitted
Posted by Keith Turner <ke...@deenlo.com>.
On Sat, Jul 13, 2013 at 9:00 PM, John Vines <vi...@apache.org> wrote:
> Did a diff of all (trunk) files for all repos and the only differences are
> the absence of .svn and the addition of .git files. That's a good start.
>
>
>
We should probably diff all of the branches. The ACCUMULO-1000 branch I
created Fri seems out of sync. I put a comment on the ticket. But I am
not sure if I am doing something wrong w/ git.
> On Sat, Jul 13, 2013 at 8:33 PM, Josh Elser <jo...@gmail.com> 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.git>
> > https://git-wip-us.apache.org/**repos/asf/accumulo-bsp.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-instamo-archetype.git>
> > https://git-wip-us.apache.org/**repos/asf/accumulo-pig.git<
> https://git-wip-us.apache.org/repos/asf/accumulo-pig.git>
> > https://git-wip-us.apache.org/**repos/asf/accumulo-wikisearch.**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<
> https://issues.apache.org/jira/browse/INFRA-6392>
> >>
> >
> >
>
Re: SVN to GIt INFRA ticket submitted
Posted by John Vines <vi...@apache.org>.
Did a diff of all (trunk) files for all repos and the only differences are
the absence of .svn and the addition of .git files. That's a good start.
On Sat, Jul 13, 2013 at 8:33 PM, Josh Elser <jo...@gmail.com> 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.git>
> https://git-wip-us.apache.org/**repos/asf/accumulo-bsp.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-instamo-archetype.git>
> https://git-wip-us.apache.org/**repos/asf/accumulo-pig.git<https://git-wip-us.apache.org/repos/asf/accumulo-pig.git>
> https://git-wip-us.apache.org/**repos/asf/accumulo-wikisearch.**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<https://issues.apache.org/jira/browse/INFRA-6392>
>>
>
>
Re: SVN to GIt INFRA ticket submitted
Posted by Christopher <ct...@apache.org>.
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 <jo...@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
>>
>>
>
Re: SVN to GIt INFRA ticket submitted
Posted by Josh Elser <jo...@gmail.com>.
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
>
Re: SVN to GIt INFRA ticket submitted
Posted by Josh Elser <jo...@gmail.com>.
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