incubator-odf-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Rob Weir <...@robweir.com>
Subject Re: List of code base needed to convert from Mercurial to SVN
Date Mon, 29 Aug 2011 19:40:42 GMT
On Mon, Aug 29, 2011 at 3:00 PM, Dave Fisher <dave2wave@comcast.net> wrote:
>
> On Aug 29, 2011, at 11:54 AM, Rob Weir wrote:
>
>> On Mon, Aug 29, 2011 at 2:46 AM, Devin Han <devinhan@apache.org> wrote:
>>> Hi Rob,
>>>
>>> I have submitted the dump file to people.apache.org.  You can use:
>>>         scp -p odf-svn.zip devinhan@people.apache.org:~/.
>>
>> This is not working for me.  I'm asked for a password, but it does not
>> accept my Apache password.
>>
>> Is anyone else seeing this?  I've never used scp before, so shout out
>> if I'm making a dumb mistake.
>
> s/devinham/robweir/
>
> Or Devin needs to
>
> chmod g+rw odf-svn.zip
>
> As in check your umask
>

OK.  This worked for me:

scp -p robweir@people.apache.org:/home/devinhan/odf-svn.zip ./odf-svn.zip

-Rob

> Regards,
> Dave
>
>>
>> -Rob
>>
>>> download it. You will see 8 dump files after unzip. They are:
>>> 1.ODFDOM
>>>  (1)generator_svn_dump
>>>     Code Generation (Revision 27):
>>> https://hg.odftoolkit.org/hg/odfdom~schema2template
>>>  (2)old_generator_svn_dump
>>>     Code Generation(deprecated) (Revision 153):
>>> https://hg.odftoolkit.org/hg/odfdom~relaxng2template
>>>  (3)odfdom_svn_dump
>>>     ODFDOM Developer Repository(Revision 133):
>>> https://hg.odftoolkit.org/hg/odfdom~developer
>>>  (4)taglets_svn_dump
>>>     JavaDoc Taglets(Revision 37):
>>> https://hg.odftoolkit.org/hg/odfdom~taglets
>>> 2.Simple API
>>>  simple_svn_dump
>>>  Simple API (Revision 105):https://hg.odftoolkit.org/hg/simple~code-base
>>> 3.Conformance Tools
>>>  (1)validator_svn_dump
>>>     ODF Validator (Revision 34):
>>> https://hg.odftoolkit.org/hg/conformancetools~odf-validator-src
>>> 4.XSLT Runner
>>>  (1)xslt_runner_svn_dump
>>>     ODF XSLT Runner (Revision 67):
>>> https://hg.odftoolkit.org/hg/conformancetools~odf-xslt-runner-src
>>>  (2)xslt_runner_task_svn_dump
>>>     ODF XSLT Runner Task (Revision 18):
>>> https://hg.odftoolkit.org/hg/conformancetools~odf-xslt-runner-task-src
>>>
>>> I have test them on my machine and please help me review it again.
>>> If all of them work well and the new repository directory is confirmed, I
>>> will create a JIRA issue to request the admin merge them to Apache SVN.
>>>
>>> BTW: You will see some of the history lost, for example "Rev 62 ODFDOM
>>> v0.8.5" in ODFDOM repository, that because the corresponding patch just
>>> modified the .hgtags file. This is a Mercurial related file, should not be
>>> included in the SVN repository.  So the lost information has no influence
>>> for  the code history. It is correct.
>>>
>>>
>>>
>>> 2011/8/26 Rob Weir <robweir@apache.org>
>>>
>>>> On Thu, Aug 25, 2011 at 11:14 PM, Devin Han <devinhan@apache.org> wrote:
>>>>> Hi all,
>>>>>
>>>>> I have converted the repository of Simple API from Mercurical  to SVN
>>>> with
>>>>> the help of  the modified shell script I mentioned before.  The other
>>>> code
>>>>> bases will be converted later.
>>>>
>>>> Great!
>>>>
>>>> I can help review this if you upload the dumpfile.
>>>>
>>>> 1) svnadmin dump file:///local-repo > dumpfile
>>>>
>>>> 2) gzip or zip the dumpfile
>>>>
>>>> 3) Upload someplace, maybe to ODF Toolkit Union website
>>>>
>>>> 4) I can then download and load the dumpfile into a local respository.
>>>>
>>>>
>>>>> In order to avoid omit, it is necessary to make sure the code base list
>>>> with
>>>>> your guys.
>>>>>
>>>>
>>>> Today we have a separate Hg repository per project, right?  Or is it
>>>> possible to clone the entire project, via
>>>> https://hg.odftoolkit.org/hg/ ?
>>>>
>>>> In the end we want to end up with a single SVN repository at Apache.
>>>>
>>>> What will be easier to accomplish this:
>>>>
>>>> 1) Combine everything into a single Hg project and then convert to SVN?
>>>>
>>>> or
>>>>
>>>> 2) Convert separate Hg projects to SVN and then merge them together in SVN?
>>>>
>>>> Which makes it easier to preserve history?
>>>>
>>>>
>>>> In SVN our root will be:
>>>>
>>>> https://svn.apache.org/repos/asf/incubator/odf/
>>>>
>>>>
>>>> So we'll want a directory structure for the trunk that looks like:
>>>>
>>>> /odf/trunk/component1
>>>> /odf/trunk/component2
>>>> /odf/trunk/component3, etc.
>>>>
>>>> I know we may merge ODFDOM and Simple API into a single component, but
>>>> that will require more time.  So let's not worry about that right now.
>>>>  We should treat them as separate components for now.
>>>>
>>>> <snip>
>>>>
>>>>> 5.AODL - the .Net module of the ODFToolkit (Revision 13):
>>>>> https://hg.odftoolkit.org/hg/aodl~developer
>>>>>
>>>>
>>>> We are not bringing the C#/.NET AODL component to Apache.    Also, I
>>>> think Svante had some additional work he wanted to complete on the
>>>> conformance component, in the ODF Toolkit Union, before moving that
>>>> repository.  So we should coordinate with him on that.
>>>>
>>>>> BTW: How can I merge these code bases to Apache SVN? Create dumps and
>>>>> request the help of the admin by JIRA issue?
>>>>>
>>>>
>>>> What I did for OpenOffice project was this:
>>>>
>>>> 1) Create a local SVN repository that had the repository exactly as I
>>>> wanted it, with the correct directory structure for the podling.
>>>>
>>>> 2) I created a dumpfile, zipped it up and posted it for the project to
>>>> review.
>>>>
>>>> 3) Other project members downloaded the dump file and verified that it
>>>> was correct
>>>>
>>>> 4) I created a JIRA issue requesting that the dump file get loaded
>>>> into SVN.  You can see that issue here and what information I
>>>> provided:
>>>>
>>>> https://issues.apache.org/jira/browse/INFRA-3862
>>>>
>>>>
>>>>> --
>>>>> -Devin
>>>>>
>>>>
>>>
>>>
>>>
>>> --
>>> -Devin
>>>
>
>

Mime
View raw message