> On Dec 13, 2024, at 3:35 PM, Matthias Seidel <matthias.sei...@hamburg.de>
> wrote:
>
> Hi Dave, Jim, All,
>
> Am 13.12.24 um 16:58 schrieb Dave Fisher:
>>
>>> On Dec 13, 2024, at 2:34 AM, Jim Jagielski <j...@jagunet.com> wrote:
>>>
>>>
>>>
>>>> On Dec 13, 2024, at 12:34 AM, Dave Fisher <w...@apache.org> wrote:
>>>>
>>>>
>>>>
>>>>> On Dec 12, 2024, at 10:39 AM, Jim Jagielski <j...@jagunet.com> wrote:
>>>>>
>>>>>
>>>>>
>>>>>> On Dec 12, 2024, at 1:04 PM, Dave Fisher <w...@apache.org> wrote:
>>>>>>
>>>>>> Agreed. Should we call the git version openoffice-devtools.git? Or do we
>>>>>> move these to a devtools directory in openoffice.git?
>>>>>>
>>>>>> We can then archive the directories that are no longer relevant
>>>>>>
>>>>>>> On Dec 12, 2024, at 2:26 AM, Jim Jagielski <j...@jagunet.com> wrote:
>>>>>>>
>>>>>>> The `devtools` repo is still hosted under svn... should we migrate it
>>>>>>> to git?
>>>>>
>>>>> Personally, I think that the latter makes more sense. I see no real
>>>>> reason why they need to be sep repos.
>>>> I agree. It will take some git magic, but it should be possible to merge
>>>> that part of the svn into apache/openoffice.git trunk as a the devtools
>>>> directory.
>>>>
>>> Is this something that requires an infra ticket?
>> I’m willing to give some ideas I’ve found on stackoverflow a try locally and
>> if that works I can push a PR.
>>
>> Step 1 is to checkout devtools with git.
>
> Devtools is SVN. Just clone it locally, copy it over to AOO\trunk and commit
> it.
>
> I don't see a need to merge anything here...
I think that preserving history would be useful, but if it is hard then you are
correct.
>> Step 2 is something like:
>> https://stackoverflow.com/questions/1425892/how-do-you-merge-two-git-repositories
>
> I still am not sure if I want it in trunk, but if it is only a sub-directory
> in root that would be OK for me.
Definitely it will be adjacent. What I like about this is that should devtools
for 4.1, 4.2, and trunk diverge we can copy the devtools to each branch!
Best,
Dave
>
> Regards,
>
> Matthias
>
>>
>> Best,
>> Dave
>>
>>> --
>>> Jim
>>> "If you can dodge a wrench, you can dodge a ball."
>>>
>>>
>>>
>>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@openoffice.apache.org
For additional commands, e-mail: dev-h...@openoffice.apache.org
