You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@sling.apache.org by Robert Munteanu <ro...@apache.org> on 2017/10/18 23:42:46 UTC
[git] Migration to git repositories sort of complete (was:
Migration to git starting, please hold commits in 30 minutes from now)
Hi,
The sources have been migrated from SVN to Git. Unfortunately there was
a snag ( https://issues.apache.org/jira/browse/INFRA-15308 ) where
repositories were created on github but not on gitbox, which means that
these repos are unusable.
Infra is looking into it. In the meantime ( 1-2 days at most hopefully
) my proposal is that we live with a split setup and commit to Git
where migrated or to SVN otherwise. That's a pretty weird setup, but
otherwise we'll have to drop + recreate all git repositories again, and
hopefully there won't be too many changes until I can complete the
migration.
The full list of repositories that were not properly created is:
sling-org-apache-sling-commons-fsclassloader.git
sling-org-apache-sling-commons-johnzon.git
sling-org-apache-sling-commons-metrics-rrd4j.git
sling-org-apache-sling-commons-messaging-mail.git
sling-org-apache-sling-commons-threads.git
sling-org-apache-sling-bundleresource-impl.git
sling-org-apache-sling-caconfig-impl.git
sling-org-apache-sling-discovery-api.git
sling-org-apache-sling-discovery-impl.git
sling-org-apache-sling-event.git
sling-org-apache-sling-fragment-ws.git
sling-org-apache-sling-fsresource.git
sling-org-apache-sling-hc-annotations.git
sling-org-apache-sling-hc-junit-bridge.git
sling-org-apache-sling-hc-samples.git
sling-org-apache-sling-hc-support.git
sling-org-apache-sling-models-validation-impl.git
sling-org-apache-sling-repoinit-parser.git
sling-org-apache-sling-settings.git
sling-org-apache-sling-validation-api.git
sling-org-apache-sling-validation-examples.git
sling-org-apache-sling-validation-test-services.git
sling-org-apache-sling-extensions-webconsolesecurityprovider.git
sling-org-apache-sling-jcr-base.git
sling-org-apache-sling-jcr-contentparser.git
sling-org-apache-sling-jcr-repository-it-resource-versioning.git
sling-org-apache-sling-jcr-jackrabbit-usermanager.git
sling-org-apache-sling-jcr-jcr-wrapper.git
sling-org-apache-sling-jcr-repoinit.git
sling-org-apache-sling-jcr-resource.git
sling-org-apache-sling-scripting-api.git
sling-org-apache-sling-scripting-el-api.git
sling-org-apache-sling-scripting-jsp.git
sling-org-apache-sling-scripting-sightly-compiler.git
sling-org-apache-sling-scripting-sightly.git
sling-org-apache-sling-scripting-sightly-testing-content.git
sling-org-apache-sling-servlets-get.git
sling-org-apache-sling-servlets-resolver.git
sling-org-apache-sling-distribution-it.git
sling-org-apache-sling-testing-clients.git
sling-tooling-jenkins.git
After this is fixed, I will complete the rest of the tasks from https:/
/issues.apache.org/jira/browse/SLING-3987, but I expect no surprises
there.
Thanks,
Robert
On Wed, 2017-10-18 at 21:33 +0200, Robert Munteanu wrote:
> Hi,
>
> As announced, I will start migrating our repositories to git. If you
> have any changes to make in SVN, please commit them in the next 30
> minutes. If something urgent comes up, let me know and I will delay
> the
> migration.
>
> I have already kicked off the SVN → Git conversion script locally. By
> my estimates it will be done in about 3 hours, so in about 3 hours
> and
> 30 minutes I will start the push to git.
>
> Note that I will re-do the migration of modules that received commits
> after I started the migration, so no data will be lost in the
> meantime.
>
> Thanks,
>
> Robert
Re: [git] Migration to git repositories sort of complete (was:
Migration to git starting, please hold commits in 30 minutes from now)
Posted by Bertrand Delacretaz <bd...@apache.org>.
Hi,
On Thu, Oct 19, 2017 at 1:42 AM, Robert Munteanu <ro...@apache.org> wrote:
> The sources have been migrated from SVN to Git....
Thanks! I have updated
http://sling.apache.org/project-information.html accordingly (should
be updated soon).
> Unfortunately there was a snag...
I have mentioned that there, pointing to
https://issues.apache.org/jira/browse/SLING-3987 - please update that
ticket once that's fixed.
-Bertrand
Re: [git] Migration to git repositories sort of complete (was:
Migration to git starting, please hold commits in 30 minutes from now)
Posted by Julian Sedding <js...@gmail.com>.
Thanks for driving this!
Regards
Julian
On Thu, Oct 19, 2017 at 1:42 AM, Robert Munteanu <ro...@apache.org> wrote:
> Hi,
>
> The sources have been migrated from SVN to Git. Unfortunately there was
> a snag ( https://issues.apache.org/jira/browse/INFRA-15308 ) where
> repositories were created on github but not on gitbox, which means that
> these repos are unusable.
>
> Infra is looking into it. In the meantime ( 1-2 days at most hopefully
> ) my proposal is that we live with a split setup and commit to Git
> where migrated or to SVN otherwise. That's a pretty weird setup, but
> otherwise we'll have to drop + recreate all git repositories again, and
> hopefully there won't be too many changes until I can complete the
> migration.
>
> The full list of repositories that were not properly created is:
>
> sling-org-apache-sling-commons-fsclassloader.git
> sling-org-apache-sling-commons-johnzon.git
> sling-org-apache-sling-commons-metrics-rrd4j.git
> sling-org-apache-sling-commons-messaging-mail.git
> sling-org-apache-sling-commons-threads.git
> sling-org-apache-sling-bundleresource-impl.git
> sling-org-apache-sling-caconfig-impl.git
> sling-org-apache-sling-discovery-api.git
> sling-org-apache-sling-discovery-impl.git
> sling-org-apache-sling-event.git
> sling-org-apache-sling-fragment-ws.git
> sling-org-apache-sling-fsresource.git
> sling-org-apache-sling-hc-annotations.git
> sling-org-apache-sling-hc-junit-bridge.git
> sling-org-apache-sling-hc-samples.git
> sling-org-apache-sling-hc-support.git
> sling-org-apache-sling-models-validation-impl.git
> sling-org-apache-sling-repoinit-parser.git
> sling-org-apache-sling-settings.git
> sling-org-apache-sling-validation-api.git
> sling-org-apache-sling-validation-examples.git
> sling-org-apache-sling-validation-test-services.git
> sling-org-apache-sling-extensions-webconsolesecurityprovider.git
> sling-org-apache-sling-jcr-base.git
> sling-org-apache-sling-jcr-contentparser.git
> sling-org-apache-sling-jcr-repository-it-resource-versioning.git
> sling-org-apache-sling-jcr-jackrabbit-usermanager.git
> sling-org-apache-sling-jcr-jcr-wrapper.git
> sling-org-apache-sling-jcr-repoinit.git
> sling-org-apache-sling-jcr-resource.git
> sling-org-apache-sling-scripting-api.git
> sling-org-apache-sling-scripting-el-api.git
> sling-org-apache-sling-scripting-jsp.git
> sling-org-apache-sling-scripting-sightly-compiler.git
> sling-org-apache-sling-scripting-sightly.git
> sling-org-apache-sling-scripting-sightly-testing-content.git
> sling-org-apache-sling-servlets-get.git
> sling-org-apache-sling-servlets-resolver.git
> sling-org-apache-sling-distribution-it.git
> sling-org-apache-sling-testing-clients.git
> sling-tooling-jenkins.git
>
> After this is fixed, I will complete the rest of the tasks from https:/
> /issues.apache.org/jira/browse/SLING-3987, but I expect no surprises
> there.
>
> Thanks,
>
> Robert
>
> On Wed, 2017-10-18 at 21:33 +0200, Robert Munteanu wrote:
>> Hi,
>>
>> As announced, I will start migrating our repositories to git. If you
>> have any changes to make in SVN, please commit them in the next 30
>> minutes. If something urgent comes up, let me know and I will delay
>> the
>> migration.
>>
>> I have already kicked off the SVN → Git conversion script locally. By
>> my estimates it will be done in about 3 hours, so in about 3 hours
>> and
>> 30 minutes I will start the push to git.
>>
>> Note that I will re-do the migration of modules that received commits
>> after I started the migration, so no data will be lost in the
>> meantime.
>>
>> Thanks,
>>
>> Robert
>
Re: What to do with github.com/apache/sling (was [git] Migration to
git repositories sort of complete)
Posted by Robert Munteanu <ro...@apache.org>.
On Mon, 2017-10-23 at 23:38 +0200, Robert Munteanu wrote:
> On Mon, 2017-10-23 at 18:40 +0100, Ian Boston wrote:
> > > So that would mean that all link to trunk would result in a 404
> > > Not
> > > Found, as I have tried it with [1].
> > > So we either
> > > a) break all links to the 'trunk' branch, or
> > > b) leave the 'trunk' branch alive, with the added disadvantage
> > > that
> > > navigating from a 'trunk' link leaves the impression that the
> > > branch/repo are still in use.
> > > Did I get this right or is there something else?
> >
> > yes. a) isnt very friendly.
> >
> > If we choose b) we could rename the repository to sling-svn-ending-
> > 2017-10
> > or something like that. GitHub will redirect all traffic.
> >
> > https://help.github.com/articles/renaming-a-repository/
>
> That's pretty cool. I would assume that we won't be able to reclaim
> the
> old 'sling' name, otherwise the redirects would not work, but this
> should make it even clearer.
>
> Robert
I tried to summarize the current discussion at
https://issues.apache.org/jira/browse/SLING-7183
I won't be able to look into this for the next two weeks, so if anyone
has the time to push this to its conclusion, feel free to do so.
Thanks,
Robert
Re: What to do with github.com/apache/sling (was [git] Migration to
git repositories sort of complete)
Posted by Robert Munteanu <ro...@apache.org>.
On Mon, 2017-10-23 at 18:40 +0100, Ian Boston wrote:
> > So that would mean that all link to trunk would result in a 404 Not
> > Found, as I have tried it with [1].
>
> > So we either
>
> > a) break all links to the 'trunk' branch, or
> > b) leave the 'trunk' branch alive, with the added disadvantage that
> > navigating from a 'trunk' link leaves the impression that the
> > branch/repo are still in use.
>
> > Did I get this right or is there something else?
>
> yes. a) isnt very friendly.
>
> If we choose b) we could rename the repository to sling-svn-ending-
> 2017-10
> or something like that. GitHub will redirect all traffic.
>
> https://help.github.com/articles/renaming-a-repository/
That's pretty cool. I would assume that we won't be able to reclaim the
old 'sling' name, otherwise the redirects would not work, but this
should make it even clearer.
Robert
Re: What to do with github.com/apache/sling (was [git] Migration to
git repositories sort of complete)
Posted by Ian Boston <ie...@tfd.co.uk>.
Hi
> So that would mean that all link to trunk would result in a 404 Not
> Found, as I have tried it with [1].
> So we either
> a) break all links to the 'trunk' branch, or
> b) leave the 'trunk' branch alive, with the added disadvantage that
> navigating from a 'trunk' link leaves the impression that the
> branch/repo are still in use.
> Did I get this right or is there something else?
yes. a) isnt very friendly.
If we choose b) we could rename the repository to sling-svn-ending-2017-10
or something like that. GitHub will redirect all traffic.
https://help.github.com/articles/renaming-a-repository/
The other option is to transfer ownership of the repository. Git will also
redirect.
https://help.github.com/articles/about-repository-transfers/
Best Regards
Ian
On 23 October 2017 at 13:48, Robert Munteanu <ro...@apache.org> wrote:
> On Sun, 2017-10-22 at 15:28 +0100, Ian Boston wrote:
> > Hi,
> > Good solution. One small modification to help anyone get to the old
> > tree.
>
> Well, I saw what we did at Adobe last time we had something similar :-)
>
> >
> > Rather than switching the main branch and making it empty, if you
> > branch
> > trunk to a new branch "archive" and then make trunk empty as you
> > suggest,
> > it will be possible to point anyone who gets a 404 to the new
> > "archive"
> > branch. Tagging the last commit from SVN would also help keep a
> > permanent
> > record.
> >
> > Only those URLs that are not pointing to a commit/tag/branch (other
> > than
> > trunk) will be broken and the README left in trunk can explain how to
> > change the URL.
>
> I think that there are plenty of links pointing to 'trunk' though. I
> have tried to make permanent links to github, but I did not do that all
> the time.
>
> So that would mean that all link to trunk would result in a 404 Not
> Found, as I have tried it with [1].
>
> So we either
>
> a) break all links to the 'trunk' branch, or
> b) leave the 'trunk' branch alive, with the added disadvantage that
> navigating from a 'trunk' link leaves the impression that the
> branch/repo are still in use.
>
> Did I get this right or is there something else?
>
> Robert
>
> [1]: https://github.com/apache/sling/blob/archived/KEYS
>
Re: What to do with github.com/apache/sling (was [git] Migration to
git repositories sort of complete)
Posted by Robert Munteanu <ro...@apache.org>.
On Sun, 2017-10-22 at 15:28 +0100, Ian Boston wrote:
> Hi,
> Good solution. One small modification to help anyone get to the old
> tree.
Well, I saw what we did at Adobe last time we had something similar :-)
>
> Rather than switching the main branch and making it empty, if you
> branch
> trunk to a new branch "archive" and then make trunk empty as you
> suggest,
> it will be possible to point anyone who gets a 404 to the new
> "archive"
> branch. Tagging the last commit from SVN would also help keep a
> permanent
> record.
>
> Only those URLs that are not pointing to a commit/tag/branch (other
> than
> trunk) will be broken and the README left in trunk can explain how to
> change the URL.
I think that there are plenty of links pointing to 'trunk' though. I
have tried to make permanent links to github, but I did not do that all
the time.
So that would mean that all link to trunk would result in a 404 Not
Found, as I have tried it with [1].
So we either
a) break all links to the 'trunk' branch, or
b) leave the 'trunk' branch alive, with the added disadvantage that
navigating from a 'trunk' link leaves the impression that the
branch/repo are still in use.
Did I get this right or is there something else?
Robert
[1]: https://github.com/apache/sling/blob/archived/KEYS
Re: What to do with github.com/apache/sling (was [git] Migration to
git repositories sort of complete)
Posted by Ian Boston <ie...@tfd.co.uk>.
Hi,
Good solution. One small modification to help anyone get to the old tree.
Rather than switching the main branch and making it empty, if you branch
trunk to a new branch "archive" and then make trunk empty as you suggest,
it will be possible to point anyone who gets a 404 to the new "archive"
branch. Tagging the last commit from SVN would also help keep a permanent
record.
Only those URLs that are not pointing to a commit/tag/branch (other than
trunk) will be broken and the README left in trunk can explain how to
change the URL.
Best Regards
Ian
On 22 October 2017 at 14:08, Justin Edelson <ju...@justinedelson.com>
wrote:
> +1
>
> Great solution.
> On Sat, Oct 21, 2017 at 3:26 PM Robert Munteanu <ro...@apache.org>
> wrote:
>
> > On Fri, 2017-10-20 at 23:19 +0200, Robert Munteanu wrote:
> > > I guess the 'minimal damage' approach would be to switch the main
> > > branch and make that empty, with just a README.md .
> > >
> > > Would need to talk to infra to see how that can happen. Unless anyone
> > > is opposed, I would create a branch called 'archived' with the
> > > following README.md contents:
> >
> > Here's how it would look once switched:
> >
> > https://github.com/apache/sling/tree/archived
> >
> > Robert
> >
>
Re: What to do with github.com/apache/sling (was [git] Migration to
git repositories sort of complete)
Posted by Justin Edelson <ju...@justinedelson.com>.
+1
Great solution.
On Sat, Oct 21, 2017 at 3:26 PM Robert Munteanu <ro...@apache.org> wrote:
> On Fri, 2017-10-20 at 23:19 +0200, Robert Munteanu wrote:
> > I guess the 'minimal damage' approach would be to switch the main
> > branch and make that empty, with just a README.md .
> >
> > Would need to talk to infra to see how that can happen. Unless anyone
> > is opposed, I would create a branch called 'archived' with the
> > following README.md contents:
>
> Here's how it would look once switched:
>
> https://github.com/apache/sling/tree/archived
>
> Robert
>
Re: What to do with github.com/apache/sling (was [git] Migration to
git repositories sort of complete)
Posted by Robert Munteanu <ro...@apache.org>.
On Fri, 2017-10-20 at 23:19 +0200, Robert Munteanu wrote:
> I guess the 'minimal damage' approach would be to switch the main
> branch and make that empty, with just a README.md .
>
> Would need to talk to infra to see how that can happen. Unless anyone
> is opposed, I would create a branch called 'archived' with the
> following README.md contents:
Here's how it would look once switched:
https://github.com/apache/sling/tree/archived
Robert
Re: What to do with github.com/apache/sling (was [git] Migration
to git repositories sort of complete)
Posted by Robert Munteanu <ro...@apache.org>.
I guess the 'minimal damage' approach would be to switch the main
branch and make that empty, with just a README.md .
Would need to talk to infra to see how that can happen. Unless anyone
is opposed, I would create a branch called 'archived' with the
following README.md contents:
8<---------------
# Apache Sling main repository (obsolete)
This repository used to contain the Apache Sling git mirror. With the
[migration to Git](https://issues.apache.org/jira/browse/SLING-3987)
the content represents and older state and should not be relied upon.
This repository is still kept to prevent broken links from various
sites to pull requests or commits.
Please do not open pull requests, they will be ignored.
For more information about the Apache Sling source repositories, see
the [project information](https://sling.apache.org/project-information.
html#source-repository).
8<---------------
Thoughts?
Robert
On Fri, 2017-10-20 at 12:45 +0100, Ian Boston wrote:
> Hi,
> I can think of at least one non public Jira whose links will break.
> Archiving probably wont work as most links point to a line number,
> commit,
> or something specific.
>
> I guess we could just say tough, its too much effort to fix, anyone
> really
> interested will find the information for themselves.
>
> I see tomcat may have had the same issue. They just started a new
> repo for
> each major version and left the old one as is.
> Annother solution is to put a readme
>
>
> Also, when you delete the apache/sling repo IIRC someone who forked
> it will
> take over and all forks will point to them, or at least, thats what
> happend
> when I deleted one of my repos. From memory it was the repo at the
> top of
> the forks list [1] which seems to be [2], but it could be the first
> person
> to fork, if you have the patience to go back through githubs record
> of the
> network.
>
> Best Regards
> Ian
>
>
> 1 https://github.com/apache/sling/network/members
> 2 https://github.com/447327642/sling
>
> On 20 October 2017 at 12:11, Robert Munteanu <ro...@apache.org>
> wrote:
>
> > Hi Ian,
> >
> > On Fri, 2017-10-20 at 11:04 +0100, Ian Boston wrote:
> > > BTW,
> > > Deleting github:apache/sling will 404 every reference to code
> > > there
> > > from
> > > JIRA in many places. Probably not a good idea to delete it, but
> > > it
> > > should
> > > be made readonly.
> >
> > That's a good point, I did not consider this.
> >
> > The problematic part of keeping the old sling repository around is
> > that
> > it is probably the entry point to many people.
> >
> > So the way I see it we have:
> >
> > 1. Keep the old 'sling' mirror on Github
> >
> > + links are not broken
> > - content is duplicated and out of date
> > - no good entry point for users when they visit
> > github.com/apache/sling
> >
> > 2. Remove the old sling-mirror
> >
> > + good entry point for Sling source code ( can contains e.g. repo
> > script to pull down all Sling modules )
> > + no duplicate or out-of-date content
> > - links are broken
> >
> > Additionally, we already have a gitbox 'sling' repository that is
> > not
> > mirrored to GitHub - https://gitbox.apache.org/repos/asf?p=sling.gi
> > t;a=
> > summary , which can add to the confusion. Yes, we can rename it so
> > it's
> > not a con per se, but wanted to point that out.
> >
> > As usual, my proposal is scripting :-) I would write a Jira script
> > that
> > inspects all the Sling tickets, and when finding a link to the
> > github.com/apache/sling repo, I would edit the comment and add a
> > note
> > that the link is outdated.
> >
> > Another alternative is to move the repo to github.com/apache/sling-
> > archive and tweak the links to point to that. What I don't really
> > like
> > about that is that we will have outdated content, which is
> > confusing.
> > Maybe we can talk to infra to move it _and_ change the default
> > branch
> > to something like 'archived'? This way we'll only get a README.md
> > which
> > says this repo is archived for historical purposes and we'll also
> > get
> > proper links if we edit the Jira comments.
> >
> > My proposal would be to remove the 'old' sling repository, with
> > tweaking the Jira comments if we think it's worthwhile.
> > Alternatively,
> > we can consider archiving it, but that's going to take a bit longer
> > due
> > to the need to write a script and also asking infra for help with
> > the
> > move.
> >
> > Thanks,
> >
> > Robert
> >
Re: What to do with github.com/apache/sling (was [git] Migration to
git repositories sort of complete)
Posted by Ian Boston <ie...@tfd.co.uk>.
Hi,
I can think of at least one non public Jira whose links will break.
Archiving probably wont work as most links point to a line number, commit,
or something specific.
I guess we could just say tough, its too much effort to fix, anyone really
interested will find the information for themselves.
I see tomcat may have had the same issue. They just started a new repo for
each major version and left the old one as is.
Annother solution is to put a readme
Also, when you delete the apache/sling repo IIRC someone who forked it will
take over and all forks will point to them, or at least, thats what happend
when I deleted one of my repos. From memory it was the repo at the top of
the forks list [1] which seems to be [2], but it could be the first person
to fork, if you have the patience to go back through githubs record of the
network.
Best Regards
Ian
1 https://github.com/apache/sling/network/members
2 https://github.com/447327642/sling
On 20 October 2017 at 12:11, Robert Munteanu <ro...@apache.org> wrote:
> Hi Ian,
>
> On Fri, 2017-10-20 at 11:04 +0100, Ian Boston wrote:
> > BTW,
> > Deleting github:apache/sling will 404 every reference to code there
> > from
> > JIRA in many places. Probably not a good idea to delete it, but it
> > should
> > be made readonly.
>
> That's a good point, I did not consider this.
>
> The problematic part of keeping the old sling repository around is that
> it is probably the entry point to many people.
>
> So the way I see it we have:
>
> 1. Keep the old 'sling' mirror on Github
>
> + links are not broken
> - content is duplicated and out of date
> - no good entry point for users when they visit github.com/apache/sling
>
> 2. Remove the old sling-mirror
>
> + good entry point for Sling source code ( can contains e.g. repo
> script to pull down all Sling modules )
> + no duplicate or out-of-date content
> - links are broken
>
> Additionally, we already have a gitbox 'sling' repository that is not
> mirrored to GitHub - https://gitbox.apache.org/repos/asf?p=sling.git;a=
> summary , which can add to the confusion. Yes, we can rename it so it's
> not a con per se, but wanted to point that out.
>
> As usual, my proposal is scripting :-) I would write a Jira script that
> inspects all the Sling tickets, and when finding a link to the
> github.com/apache/sling repo, I would edit the comment and add a note
> that the link is outdated.
>
> Another alternative is to move the repo to github.com/apache/sling-
> archive and tweak the links to point to that. What I don't really like
> about that is that we will have outdated content, which is confusing.
> Maybe we can talk to infra to move it _and_ change the default branch
> to something like 'archived'? This way we'll only get a README.md which
> says this repo is archived for historical purposes and we'll also get
> proper links if we edit the Jira comments.
>
> My proposal would be to remove the 'old' sling repository, with
> tweaking the Jira comments if we think it's worthwhile. Alternatively,
> we can consider archiving it, but that's going to take a bit longer due
> to the need to write a script and also asking infra for help with the
> move.
>
> Thanks,
>
> Robert
>
What to do with github.com/apache/sling (was [git] Migration to git
repositories sort of complete)
Posted by Robert Munteanu <ro...@apache.org>.
Hi Ian,
On Fri, 2017-10-20 at 11:04 +0100, Ian Boston wrote:
> BTW,
> Deleting github:apache/sling will 404 every reference to code there
> from
> JIRA in many places. Probably not a good idea to delete it, but it
> should
> be made readonly.
That's a good point, I did not consider this.
The problematic part of keeping the old sling repository around is that
it is probably the entry point to many people.
So the way I see it we have:
1. Keep the old 'sling' mirror on Github
+ links are not broken
- content is duplicated and out of date
- no good entry point for users when they visit github.com/apache/sling
2. Remove the old sling-mirror
+ good entry point for Sling source code ( can contains e.g. repo
script to pull down all Sling modules )
+ no duplicate or out-of-date content
- links are broken
Additionally, we already have a gitbox 'sling' repository that is not
mirrored to GitHub - https://gitbox.apache.org/repos/asf?p=sling.git;a=
summary , which can add to the confusion. Yes, we can rename it so it's
not a con per se, but wanted to point that out.
As usual, my proposal is scripting :-) I would write a Jira script that
inspects all the Sling tickets, and when finding a link to the
github.com/apache/sling repo, I would edit the comment and add a note
that the link is outdated.
Another alternative is to move the repo to github.com/apache/sling-
archive and tweak the links to point to that. What I don't really like
about that is that we will have outdated content, which is confusing.
Maybe we can talk to infra to move it _and_ change the default branch
to something like 'archived'? This way we'll only get a README.md which
says this repo is archived for historical purposes and we'll also get
proper links if we edit the Jira comments.
My proposal would be to remove the 'old' sling repository, with
tweaking the Jira comments if we think it's worthwhile. Alternatively,
we can consider archiving it, but that's going to take a bit longer due
to the need to write a script and also asking infra for help with the
move.
Thanks,
Robert
Re: [git] Migration to git repositories sort of complete (was:
Migration to git starting, please hold commits in 30 minutes from now)
Posted by Ian Boston <ie...@tfd.co.uk>.
BTW,
Deleting github:apache/sling will 404 every reference to code there from
JIRA in many places. Probably not a good idea to delete it, but it should
be made readonly.
Best Regards
Ian
On 19 October 2017 at 12:32, Robert Munteanu <ro...@apache.org> wrote:
> Hi Ian,
>
> On Thu, 2017-10-19 at 11:44 +0100, Ian Boston wrote:
> > Hi,
> > Some more appear to be empty.
> > eg
> > sling-org-apache-sling-api
>
> That's a good catch, somehow I missed it from the list.
>
> I made the following calculations:
>
> 1. we have 258 repositories on Github. Out of these we substract:
>
> - sling ( old SVM mirror )
> - sling-site
> - incubator-sling-sling-orgapacheslingapi
> - sling-orgapacheslingapi
> - incubator-sling-sling-orgapacheslingapi
>
> The last 3 are me experimenting with the reporeq tool.
>
> That leaves us with 253 repositories to migrate.
>
> 2. In my local 'sling-modules' repository I have 253 repositories to
> migrate, which looks right.
>
> 3. Running a quick for loop in that directory and pushing to gitbox
> results in 211 'up-to-date' results and 42 'not found' results.
>
> That indicates that the list of 41 was missing just the 'api' project.
>
> >
> > searching for sling- with
> > java 175
> > goovy 4
> > html 2
> > javascript 2
> > shell 2
> > total 185
> >
> > leaving 93 with no content.
> >
> > The list on infra has 41.
> >
> > If I find that a repo is empty on Git should I commit to SVN instead
> > ?
>
> Yes, and please let me know if I've missed so I can make sure we
> migrate it.
>
> Thanks,
>
> Robret
>
> > Best Regards
> > Ian
> >
> >
> > On 19 October 2017 at 08:55, Ian Boston <ie...@tfd.co.uk> wrote:
> >
> > > Perfect.
> > > Thanks
> > > Best Regards
> > > Ian
> > >
> > > On 19 October 2017 at 08:34, Robert Munteanu <ro...@apache.org>
> > > wrote:
> > >
> > > > On Thu, 2017-10-19 at 07:30 +0100, Ian Boston wrote:
> > > > > Hi,
> > > > > Thanks for working into the early hours to do this.
> > > > >
> > > > > So, IIUC, a pull request/patch that was originally against the
> > > > > whole
> > > > > SVN
> > > > > repo now has to work out which parts are in Git and which parts
> > > > > and
> > > > > in SVN.
> > > > > For those parts that are in git, apply there are remove from
> > > > > the SVN
> > > > > patch.
> > > > > Once everything that can be done in git is done, then apply the
> > > > > remaining
> > > > > SVN patch to SVN.
> > > >
> > > > Unfortunately, yes. Or just wait for the repo situation to be
> > > > worked
> > > > out and apply it to the git repositories. Which not that much
> > > > better I
> > > > guess.
> > > >
> > > > >
> > > > > Since this will not be done in the right order the build in
> > > > > those
> > > > > modules
> > > > > will break for a short while until the SVN+Git repository
> > > > > reaches its
> > > > > consistent state (ie eventually consistent), but it will
> > > > > eventually
> > > > > build
> > > > > if the patches are ok.
> > > >
> > > > Exactly.
> > > >
> > > > >
> > > > > Is that the right procedure while Infra fixes the missing repo?
> > > > > And the right expectation for builds ?
> > > >
> > > > Just to confirm - yes and yes.
> > > >
> > > > Robert
> > > >
> > > > > Best Regards
> > > > > Ian
> > > > >
> > > > >
> > > > >
> > > > > On 19 October 2017 at 00:42, Robert Munteanu <rombert@apache.or
> > > > > g>
> > > > > wrote:
> > > > >
> > > > > > Hi,
> > > > > >
> > > > > > The sources have been migrated from SVN to Git. Unfortunately
> > > > > > there
> > > > > > was
> > > > > > a snag ( https://issues.apache.org/jira/browse/INFRA-15308 )
> > > > > > where
> > > > > > repositories were created on github but not on gitbox, which
> > > > > > means
> > > > > > that
> > > > > > these repos are unusable.
> > > > > >
> > > > > > Infra is looking into it. In the meantime ( 1-2 days at most
> > > > > > hopefully
> > > > > > ) my proposal is that we live with a split setup and commit
> > > > > > to Git
> > > > > > where migrated or to SVN otherwise. That's a pretty weird
> > > > > > setup,
> > > > > > but
> > > > > > otherwise we'll have to drop + recreate all git repositories
> > > > > > again,
> > > > > > and
> > > > > > hopefully there won't be too many changes until I can
> > > > > > complete the
> > > > > > migration.
> > > > > >
> > > > > > The full list of repositories that were not properly created
> > > > > > is:
> > > > > >
> > > > > > sling-org-apache-sling-commons-fsclassloader.git
> > > > > > sling-org-apache-sling-commons-johnzon.git
> > > > > > sling-org-apache-sling-commons-metrics-rrd4j.git
> > > > > > sling-org-apache-sling-commons-messaging-mail.git
> > > > > > sling-org-apache-sling-commons-threads.git
> > > > > > sling-org-apache-sling-bundleresource-impl.git
> > > > > > sling-org-apache-sling-caconfig-impl.git
> > > > > > sling-org-apache-sling-discovery-api.git
> > > > > > sling-org-apache-sling-discovery-impl.git
> > > > > > sling-org-apache-sling-event.git
> > > > > > sling-org-apache-sling-fragment-ws.git
> > > > > > sling-org-apache-sling-fsresource.git
> > > > > > sling-org-apache-sling-hc-annotations.git
> > > > > > sling-org-apache-sling-hc-junit-bridge.git
> > > > > > sling-org-apache-sling-hc-samples.git
> > > > > > sling-org-apache-sling-hc-support.git
> > > > > > sling-org-apache-sling-models-validation-impl.git
> > > > > > sling-org-apache-sling-repoinit-parser.git
> > > > > > sling-org-apache-sling-settings.git
> > > > > > sling-org-apache-sling-validation-api.git
> > > > > > sling-org-apache-sling-validation-examples.git
> > > > > > sling-org-apache-sling-validation-test-services.git
> > > > > > sling-org-apache-sling-extensions-
> > > > > > webconsolesecurityprovider.git
> > > > > > sling-org-apache-sling-jcr-base.git
> > > > > > sling-org-apache-sling-jcr-contentparser.git
> > > > > > sling-org-apache-sling-jcr-repository-it-resource-
> > > > > > versioning.git
> > > > > > sling-org-apache-sling-jcr-jackrabbit-usermanager.git
> > > > > > sling-org-apache-sling-jcr-jcr-wrapper.git
> > > > > > sling-org-apache-sling-jcr-repoinit.git
> > > > > > sling-org-apache-sling-jcr-resource.git
> > > > > > sling-org-apache-sling-scripting-api.git
> > > > > > sling-org-apache-sling-scripting-el-api.git
> > > > > > sling-org-apache-sling-scripting-jsp.git
> > > > > > sling-org-apache-sling-scripting-sightly-compiler.git
> > > > > > sling-org-apache-sling-scripting-sightly.git
> > > > > > sling-org-apache-sling-scripting-sightly-testing-content.git
> > > > > > sling-org-apache-sling-servlets-get.git
> > > > > > sling-org-apache-sling-servlets-resolver.git
> > > > > > sling-org-apache-sling-distribution-it.git
> > > > > > sling-org-apache-sling-testing-clients.git
> > > > > > sling-tooling-jenkins.git
> > > > > >
> > > > > > After this is fixed, I will complete the rest of the tasks
> > > > > > from
> > > > > > https:/
> > > > > > /issues.apache.org/jira/browse/SLING-3987, but I expect no
> > > > > > surprises
> > > > > > there.
> > > > > >
> > > > > > Thanks,
> > > > > >
> > > > > > Robert
> > > > > >
> > > > > > On Wed, 2017-10-18 at 21:33 +0200, Robert Munteanu wrote:
> > > > > > > Hi,
> > > > > > >
> > > > > > > As announced, I will start migrating our repositories to
> > > > > > > git. If
> > > > > > > you
> > > > > > > have any changes to make in SVN, please commit them in the
> > > > > > > next
> > > > > > > 30
> > > > > > > minutes. If something urgent comes up, let me know and I
> > > > > > > will
> > > > > > > delay
> > > > > > > the
> > > > > > > migration.
> > > > > > >
> > > > > > > I have already kicked off the SVN → Git conversion script
> > > > > > > locally. By
> > > > > > > my estimates it will be done in about 3 hours, so in about
> > > > > > > 3
> > > > > > > hours
> > > > > > > and
> > > > > > > 30 minutes I will start the push to git.
> > > > > > >
> > > > > > > Note that I will re-do the migration of modules that
> > > > > > > received
> > > > > > > commits
> > > > > > > after I started the migration, so no data will be lost in
> > > > > > > the
> > > > > > > meantime.
> > > > > > >
> > > > > > > Thanks,
> > > > > > >
> > > > > > > Robert
> > > > > >
> > > > > >
> > > >
> > > >
>
>
Re: [git] Migration to git repositories sort of complete (was:
Migration to git starting, please hold commits in 30 minutes from now)
Posted by Robert Munteanu <ro...@apache.org>.
Hi Ian,
On Thu, 2017-10-19 at 11:44 +0100, Ian Boston wrote:
> Hi,
> Some more appear to be empty.
> eg
> sling-org-apache-sling-api
That's a good catch, somehow I missed it from the list.
I made the following calculations:
1. we have 258 repositories on Github. Out of these we substract:
- sling ( old SVM mirror )
- sling-site
- incubator-sling-sling-orgapacheslingapi
- sling-orgapacheslingapi
- incubator-sling-sling-orgapacheslingapi
The last 3 are me experimenting with the reporeq tool.
That leaves us with 253 repositories to migrate.
2. In my local 'sling-modules' repository I have 253 repositories to
migrate, which looks right.
3. Running a quick for loop in that directory and pushing to gitbox
results in 211 'up-to-date' results and 42 'not found' results.
That indicates that the list of 41 was missing just the 'api' project.
>
> searching for sling- with
> java 175
> goovy 4
> html 2
> javascript 2
> shell 2
> total 185
>
> leaving 93 with no content.
>
> The list on infra has 41.
>
> If I find that a repo is empty on Git should I commit to SVN instead
> ?
Yes, and please let me know if I've missed so I can make sure we
migrate it.
Thanks,
Robret
> Best Regards
> Ian
>
>
> On 19 October 2017 at 08:55, Ian Boston <ie...@tfd.co.uk> wrote:
>
> > Perfect.
> > Thanks
> > Best Regards
> > Ian
> >
> > On 19 October 2017 at 08:34, Robert Munteanu <ro...@apache.org>
> > wrote:
> >
> > > On Thu, 2017-10-19 at 07:30 +0100, Ian Boston wrote:
> > > > Hi,
> > > > Thanks for working into the early hours to do this.
> > > >
> > > > So, IIUC, a pull request/patch that was originally against the
> > > > whole
> > > > SVN
> > > > repo now has to work out which parts are in Git and which parts
> > > > and
> > > > in SVN.
> > > > For those parts that are in git, apply there are remove from
> > > > the SVN
> > > > patch.
> > > > Once everything that can be done in git is done, then apply the
> > > > remaining
> > > > SVN patch to SVN.
> > >
> > > Unfortunately, yes. Or just wait for the repo situation to be
> > > worked
> > > out and apply it to the git repositories. Which not that much
> > > better I
> > > guess.
> > >
> > > >
> > > > Since this will not be done in the right order the build in
> > > > those
> > > > modules
> > > > will break for a short while until the SVN+Git repository
> > > > reaches its
> > > > consistent state (ie eventually consistent), but it will
> > > > eventually
> > > > build
> > > > if the patches are ok.
> > >
> > > Exactly.
> > >
> > > >
> > > > Is that the right procedure while Infra fixes the missing repo?
> > > > And the right expectation for builds ?
> > >
> > > Just to confirm - yes and yes.
> > >
> > > Robert
> > >
> > > > Best Regards
> > > > Ian
> > > >
> > > >
> > > >
> > > > On 19 October 2017 at 00:42, Robert Munteanu <rombert@apache.or
> > > > g>
> > > > wrote:
> > > >
> > > > > Hi,
> > > > >
> > > > > The sources have been migrated from SVN to Git. Unfortunately
> > > > > there
> > > > > was
> > > > > a snag ( https://issues.apache.org/jira/browse/INFRA-15308 )
> > > > > where
> > > > > repositories were created on github but not on gitbox, which
> > > > > means
> > > > > that
> > > > > these repos are unusable.
> > > > >
> > > > > Infra is looking into it. In the meantime ( 1-2 days at most
> > > > > hopefully
> > > > > ) my proposal is that we live with a split setup and commit
> > > > > to Git
> > > > > where migrated or to SVN otherwise. That's a pretty weird
> > > > > setup,
> > > > > but
> > > > > otherwise we'll have to drop + recreate all git repositories
> > > > > again,
> > > > > and
> > > > > hopefully there won't be too many changes until I can
> > > > > complete the
> > > > > migration.
> > > > >
> > > > > The full list of repositories that were not properly created
> > > > > is:
> > > > >
> > > > > sling-org-apache-sling-commons-fsclassloader.git
> > > > > sling-org-apache-sling-commons-johnzon.git
> > > > > sling-org-apache-sling-commons-metrics-rrd4j.git
> > > > > sling-org-apache-sling-commons-messaging-mail.git
> > > > > sling-org-apache-sling-commons-threads.git
> > > > > sling-org-apache-sling-bundleresource-impl.git
> > > > > sling-org-apache-sling-caconfig-impl.git
> > > > > sling-org-apache-sling-discovery-api.git
> > > > > sling-org-apache-sling-discovery-impl.git
> > > > > sling-org-apache-sling-event.git
> > > > > sling-org-apache-sling-fragment-ws.git
> > > > > sling-org-apache-sling-fsresource.git
> > > > > sling-org-apache-sling-hc-annotations.git
> > > > > sling-org-apache-sling-hc-junit-bridge.git
> > > > > sling-org-apache-sling-hc-samples.git
> > > > > sling-org-apache-sling-hc-support.git
> > > > > sling-org-apache-sling-models-validation-impl.git
> > > > > sling-org-apache-sling-repoinit-parser.git
> > > > > sling-org-apache-sling-settings.git
> > > > > sling-org-apache-sling-validation-api.git
> > > > > sling-org-apache-sling-validation-examples.git
> > > > > sling-org-apache-sling-validation-test-services.git
> > > > > sling-org-apache-sling-extensions-
> > > > > webconsolesecurityprovider.git
> > > > > sling-org-apache-sling-jcr-base.git
> > > > > sling-org-apache-sling-jcr-contentparser.git
> > > > > sling-org-apache-sling-jcr-repository-it-resource-
> > > > > versioning.git
> > > > > sling-org-apache-sling-jcr-jackrabbit-usermanager.git
> > > > > sling-org-apache-sling-jcr-jcr-wrapper.git
> > > > > sling-org-apache-sling-jcr-repoinit.git
> > > > > sling-org-apache-sling-jcr-resource.git
> > > > > sling-org-apache-sling-scripting-api.git
> > > > > sling-org-apache-sling-scripting-el-api.git
> > > > > sling-org-apache-sling-scripting-jsp.git
> > > > > sling-org-apache-sling-scripting-sightly-compiler.git
> > > > > sling-org-apache-sling-scripting-sightly.git
> > > > > sling-org-apache-sling-scripting-sightly-testing-content.git
> > > > > sling-org-apache-sling-servlets-get.git
> > > > > sling-org-apache-sling-servlets-resolver.git
> > > > > sling-org-apache-sling-distribution-it.git
> > > > > sling-org-apache-sling-testing-clients.git
> > > > > sling-tooling-jenkins.git
> > > > >
> > > > > After this is fixed, I will complete the rest of the tasks
> > > > > from
> > > > > https:/
> > > > > /issues.apache.org/jira/browse/SLING-3987, but I expect no
> > > > > surprises
> > > > > there.
> > > > >
> > > > > Thanks,
> > > > >
> > > > > Robert
> > > > >
> > > > > On Wed, 2017-10-18 at 21:33 +0200, Robert Munteanu wrote:
> > > > > > Hi,
> > > > > >
> > > > > > As announced, I will start migrating our repositories to
> > > > > > git. If
> > > > > > you
> > > > > > have any changes to make in SVN, please commit them in the
> > > > > > next
> > > > > > 30
> > > > > > minutes. If something urgent comes up, let me know and I
> > > > > > will
> > > > > > delay
> > > > > > the
> > > > > > migration.
> > > > > >
> > > > > > I have already kicked off the SVN → Git conversion script
> > > > > > locally. By
> > > > > > my estimates it will be done in about 3 hours, so in about
> > > > > > 3
> > > > > > hours
> > > > > > and
> > > > > > 30 minutes I will start the push to git.
> > > > > >
> > > > > > Note that I will re-do the migration of modules that
> > > > > > received
> > > > > > commits
> > > > > > after I started the migration, so no data will be lost in
> > > > > > the
> > > > > > meantime.
> > > > > >
> > > > > > Thanks,
> > > > > >
> > > > > > Robert
> > > > >
> > > > >
> > >
> > >
Re: [git] Migration to git repositories sort of complete (was:
Migration to git starting, please hold commits in 30 minutes from now)
Posted by Ian Boston <ie...@tfd.co.uk>.
Hi,
Some more appear to be empty.
eg
sling-org-apache-sling-api
searching for sling- with
java 175
goovy 4
html 2
javascript 2
shell 2
total 185
leaving 93 with no content.
The list on infra has 41.
If I find that a repo is empty on Git should I commit to SVN instead ?
Best Regards
Ian
On 19 October 2017 at 08:55, Ian Boston <ie...@tfd.co.uk> wrote:
> Perfect.
> Thanks
> Best Regards
> Ian
>
> On 19 October 2017 at 08:34, Robert Munteanu <ro...@apache.org> wrote:
>
>> On Thu, 2017-10-19 at 07:30 +0100, Ian Boston wrote:
>> > Hi,
>> > Thanks for working into the early hours to do this.
>> >
>> > So, IIUC, a pull request/patch that was originally against the whole
>> > SVN
>> > repo now has to work out which parts are in Git and which parts and
>> > in SVN.
>> > For those parts that are in git, apply there are remove from the SVN
>> > patch.
>> > Once everything that can be done in git is done, then apply the
>> > remaining
>> > SVN patch to SVN.
>>
>> Unfortunately, yes. Or just wait for the repo situation to be worked
>> out and apply it to the git repositories. Which not that much better I
>> guess.
>>
>> >
>> > Since this will not be done in the right order the build in those
>> > modules
>> > will break for a short while until the SVN+Git repository reaches its
>> > consistent state (ie eventually consistent), but it will eventually
>> > build
>> > if the patches are ok.
>>
>> Exactly.
>>
>> >
>> > Is that the right procedure while Infra fixes the missing repo?
>> > And the right expectation for builds ?
>>
>> Just to confirm - yes and yes.
>>
>> Robert
>>
>> > Best Regards
>> > Ian
>> >
>> >
>> >
>> > On 19 October 2017 at 00:42, Robert Munteanu <ro...@apache.org>
>> > wrote:
>> >
>> > > Hi,
>> > >
>> > > The sources have been migrated from SVN to Git. Unfortunately there
>> > > was
>> > > a snag ( https://issues.apache.org/jira/browse/INFRA-15308 ) where
>> > > repositories were created on github but not on gitbox, which means
>> > > that
>> > > these repos are unusable.
>> > >
>> > > Infra is looking into it. In the meantime ( 1-2 days at most
>> > > hopefully
>> > > ) my proposal is that we live with a split setup and commit to Git
>> > > where migrated or to SVN otherwise. That's a pretty weird setup,
>> > > but
>> > > otherwise we'll have to drop + recreate all git repositories again,
>> > > and
>> > > hopefully there won't be too many changes until I can complete the
>> > > migration.
>> > >
>> > > The full list of repositories that were not properly created is:
>> > >
>> > > sling-org-apache-sling-commons-fsclassloader.git
>> > > sling-org-apache-sling-commons-johnzon.git
>> > > sling-org-apache-sling-commons-metrics-rrd4j.git
>> > > sling-org-apache-sling-commons-messaging-mail.git
>> > > sling-org-apache-sling-commons-threads.git
>> > > sling-org-apache-sling-bundleresource-impl.git
>> > > sling-org-apache-sling-caconfig-impl.git
>> > > sling-org-apache-sling-discovery-api.git
>> > > sling-org-apache-sling-discovery-impl.git
>> > > sling-org-apache-sling-event.git
>> > > sling-org-apache-sling-fragment-ws.git
>> > > sling-org-apache-sling-fsresource.git
>> > > sling-org-apache-sling-hc-annotations.git
>> > > sling-org-apache-sling-hc-junit-bridge.git
>> > > sling-org-apache-sling-hc-samples.git
>> > > sling-org-apache-sling-hc-support.git
>> > > sling-org-apache-sling-models-validation-impl.git
>> > > sling-org-apache-sling-repoinit-parser.git
>> > > sling-org-apache-sling-settings.git
>> > > sling-org-apache-sling-validation-api.git
>> > > sling-org-apache-sling-validation-examples.git
>> > > sling-org-apache-sling-validation-test-services.git
>> > > sling-org-apache-sling-extensions-webconsolesecurityprovider.git
>> > > sling-org-apache-sling-jcr-base.git
>> > > sling-org-apache-sling-jcr-contentparser.git
>> > > sling-org-apache-sling-jcr-repository-it-resource-versioning.git
>> > > sling-org-apache-sling-jcr-jackrabbit-usermanager.git
>> > > sling-org-apache-sling-jcr-jcr-wrapper.git
>> > > sling-org-apache-sling-jcr-repoinit.git
>> > > sling-org-apache-sling-jcr-resource.git
>> > > sling-org-apache-sling-scripting-api.git
>> > > sling-org-apache-sling-scripting-el-api.git
>> > > sling-org-apache-sling-scripting-jsp.git
>> > > sling-org-apache-sling-scripting-sightly-compiler.git
>> > > sling-org-apache-sling-scripting-sightly.git
>> > > sling-org-apache-sling-scripting-sightly-testing-content.git
>> > > sling-org-apache-sling-servlets-get.git
>> > > sling-org-apache-sling-servlets-resolver.git
>> > > sling-org-apache-sling-distribution-it.git
>> > > sling-org-apache-sling-testing-clients.git
>> > > sling-tooling-jenkins.git
>> > >
>> > > After this is fixed, I will complete the rest of the tasks from
>> > > https:/
>> > > /issues.apache.org/jira/browse/SLING-3987, but I expect no
>> > > surprises
>> > > there.
>> > >
>> > > Thanks,
>> > >
>> > > Robert
>> > >
>> > > On Wed, 2017-10-18 at 21:33 +0200, Robert Munteanu wrote:
>> > > > Hi,
>> > > >
>> > > > As announced, I will start migrating our repositories to git. If
>> > > > you
>> > > > have any changes to make in SVN, please commit them in the next
>> > > > 30
>> > > > minutes. If something urgent comes up, let me know and I will
>> > > > delay
>> > > > the
>> > > > migration.
>> > > >
>> > > > I have already kicked off the SVN → Git conversion script
>> > > > locally. By
>> > > > my estimates it will be done in about 3 hours, so in about 3
>> > > > hours
>> > > > and
>> > > > 30 minutes I will start the push to git.
>> > > >
>> > > > Note that I will re-do the migration of modules that received
>> > > > commits
>> > > > after I started the migration, so no data will be lost in the
>> > > > meantime.
>> > > >
>> > > > Thanks,
>> > > >
>> > > > Robert
>> > >
>> > >
>>
>>
>
Re: [git] Migration to git repositories sort of complete (was:
Migration to git starting, please hold commits in 30 minutes from now)
Posted by Ian Boston <ie...@tfd.co.uk>.
Perfect.
Thanks
Best Regards
Ian
On 19 October 2017 at 08:34, Robert Munteanu <ro...@apache.org> wrote:
> On Thu, 2017-10-19 at 07:30 +0100, Ian Boston wrote:
> > Hi,
> > Thanks for working into the early hours to do this.
> >
> > So, IIUC, a pull request/patch that was originally against the whole
> > SVN
> > repo now has to work out which parts are in Git and which parts and
> > in SVN.
> > For those parts that are in git, apply there are remove from the SVN
> > patch.
> > Once everything that can be done in git is done, then apply the
> > remaining
> > SVN patch to SVN.
>
> Unfortunately, yes. Or just wait for the repo situation to be worked
> out and apply it to the git repositories. Which not that much better I
> guess.
>
> >
> > Since this will not be done in the right order the build in those
> > modules
> > will break for a short while until the SVN+Git repository reaches its
> > consistent state (ie eventually consistent), but it will eventually
> > build
> > if the patches are ok.
>
> Exactly.
>
> >
> > Is that the right procedure while Infra fixes the missing repo?
> > And the right expectation for builds ?
>
> Just to confirm - yes and yes.
>
> Robert
>
> > Best Regards
> > Ian
> >
> >
> >
> > On 19 October 2017 at 00:42, Robert Munteanu <ro...@apache.org>
> > wrote:
> >
> > > Hi,
> > >
> > > The sources have been migrated from SVN to Git. Unfortunately there
> > > was
> > > a snag ( https://issues.apache.org/jira/browse/INFRA-15308 ) where
> > > repositories were created on github but not on gitbox, which means
> > > that
> > > these repos are unusable.
> > >
> > > Infra is looking into it. In the meantime ( 1-2 days at most
> > > hopefully
> > > ) my proposal is that we live with a split setup and commit to Git
> > > where migrated or to SVN otherwise. That's a pretty weird setup,
> > > but
> > > otherwise we'll have to drop + recreate all git repositories again,
> > > and
> > > hopefully there won't be too many changes until I can complete the
> > > migration.
> > >
> > > The full list of repositories that were not properly created is:
> > >
> > > sling-org-apache-sling-commons-fsclassloader.git
> > > sling-org-apache-sling-commons-johnzon.git
> > > sling-org-apache-sling-commons-metrics-rrd4j.git
> > > sling-org-apache-sling-commons-messaging-mail.git
> > > sling-org-apache-sling-commons-threads.git
> > > sling-org-apache-sling-bundleresource-impl.git
> > > sling-org-apache-sling-caconfig-impl.git
> > > sling-org-apache-sling-discovery-api.git
> > > sling-org-apache-sling-discovery-impl.git
> > > sling-org-apache-sling-event.git
> > > sling-org-apache-sling-fragment-ws.git
> > > sling-org-apache-sling-fsresource.git
> > > sling-org-apache-sling-hc-annotations.git
> > > sling-org-apache-sling-hc-junit-bridge.git
> > > sling-org-apache-sling-hc-samples.git
> > > sling-org-apache-sling-hc-support.git
> > > sling-org-apache-sling-models-validation-impl.git
> > > sling-org-apache-sling-repoinit-parser.git
> > > sling-org-apache-sling-settings.git
> > > sling-org-apache-sling-validation-api.git
> > > sling-org-apache-sling-validation-examples.git
> > > sling-org-apache-sling-validation-test-services.git
> > > sling-org-apache-sling-extensions-webconsolesecurityprovider.git
> > > sling-org-apache-sling-jcr-base.git
> > > sling-org-apache-sling-jcr-contentparser.git
> > > sling-org-apache-sling-jcr-repository-it-resource-versioning.git
> > > sling-org-apache-sling-jcr-jackrabbit-usermanager.git
> > > sling-org-apache-sling-jcr-jcr-wrapper.git
> > > sling-org-apache-sling-jcr-repoinit.git
> > > sling-org-apache-sling-jcr-resource.git
> > > sling-org-apache-sling-scripting-api.git
> > > sling-org-apache-sling-scripting-el-api.git
> > > sling-org-apache-sling-scripting-jsp.git
> > > sling-org-apache-sling-scripting-sightly-compiler.git
> > > sling-org-apache-sling-scripting-sightly.git
> > > sling-org-apache-sling-scripting-sightly-testing-content.git
> > > sling-org-apache-sling-servlets-get.git
> > > sling-org-apache-sling-servlets-resolver.git
> > > sling-org-apache-sling-distribution-it.git
> > > sling-org-apache-sling-testing-clients.git
> > > sling-tooling-jenkins.git
> > >
> > > After this is fixed, I will complete the rest of the tasks from
> > > https:/
> > > /issues.apache.org/jira/browse/SLING-3987, but I expect no
> > > surprises
> > > there.
> > >
> > > Thanks,
> > >
> > > Robert
> > >
> > > On Wed, 2017-10-18 at 21:33 +0200, Robert Munteanu wrote:
> > > > Hi,
> > > >
> > > > As announced, I will start migrating our repositories to git. If
> > > > you
> > > > have any changes to make in SVN, please commit them in the next
> > > > 30
> > > > minutes. If something urgent comes up, let me know and I will
> > > > delay
> > > > the
> > > > migration.
> > > >
> > > > I have already kicked off the SVN → Git conversion script
> > > > locally. By
> > > > my estimates it will be done in about 3 hours, so in about 3
> > > > hours
> > > > and
> > > > 30 minutes I will start the push to git.
> > > >
> > > > Note that I will re-do the migration of modules that received
> > > > commits
> > > > after I started the migration, so no data will be lost in the
> > > > meantime.
> > > >
> > > > Thanks,
> > > >
> > > > Robert
> > >
> > >
>
>
Re: [git] Migration to git repositories sort of complete (was:
Migration to git starting, please hold commits in 30 minutes from now)
Posted by Robert Munteanu <ro...@apache.org>.
On Thu, 2017-10-19 at 07:30 +0100, Ian Boston wrote:
> Hi,
> Thanks for working into the early hours to do this.
>
> So, IIUC, a pull request/patch that was originally against the whole
> SVN
> repo now has to work out which parts are in Git and which parts and
> in SVN.
> For those parts that are in git, apply there are remove from the SVN
> patch.
> Once everything that can be done in git is done, then apply the
> remaining
> SVN patch to SVN.
Unfortunately, yes. Or just wait for the repo situation to be worked
out and apply it to the git repositories. Which not that much better I
guess.
>
> Since this will not be done in the right order the build in those
> modules
> will break for a short while until the SVN+Git repository reaches its
> consistent state (ie eventually consistent), but it will eventually
> build
> if the patches are ok.
Exactly.
>
> Is that the right procedure while Infra fixes the missing repo?
> And the right expectation for builds ?
Just to confirm - yes and yes.
Robert
> Best Regards
> Ian
>
>
>
> On 19 October 2017 at 00:42, Robert Munteanu <ro...@apache.org>
> wrote:
>
> > Hi,
> >
> > The sources have been migrated from SVN to Git. Unfortunately there
> > was
> > a snag ( https://issues.apache.org/jira/browse/INFRA-15308 ) where
> > repositories were created on github but not on gitbox, which means
> > that
> > these repos are unusable.
> >
> > Infra is looking into it. In the meantime ( 1-2 days at most
> > hopefully
> > ) my proposal is that we live with a split setup and commit to Git
> > where migrated or to SVN otherwise. That's a pretty weird setup,
> > but
> > otherwise we'll have to drop + recreate all git repositories again,
> > and
> > hopefully there won't be too many changes until I can complete the
> > migration.
> >
> > The full list of repositories that were not properly created is:
> >
> > sling-org-apache-sling-commons-fsclassloader.git
> > sling-org-apache-sling-commons-johnzon.git
> > sling-org-apache-sling-commons-metrics-rrd4j.git
> > sling-org-apache-sling-commons-messaging-mail.git
> > sling-org-apache-sling-commons-threads.git
> > sling-org-apache-sling-bundleresource-impl.git
> > sling-org-apache-sling-caconfig-impl.git
> > sling-org-apache-sling-discovery-api.git
> > sling-org-apache-sling-discovery-impl.git
> > sling-org-apache-sling-event.git
> > sling-org-apache-sling-fragment-ws.git
> > sling-org-apache-sling-fsresource.git
> > sling-org-apache-sling-hc-annotations.git
> > sling-org-apache-sling-hc-junit-bridge.git
> > sling-org-apache-sling-hc-samples.git
> > sling-org-apache-sling-hc-support.git
> > sling-org-apache-sling-models-validation-impl.git
> > sling-org-apache-sling-repoinit-parser.git
> > sling-org-apache-sling-settings.git
> > sling-org-apache-sling-validation-api.git
> > sling-org-apache-sling-validation-examples.git
> > sling-org-apache-sling-validation-test-services.git
> > sling-org-apache-sling-extensions-webconsolesecurityprovider.git
> > sling-org-apache-sling-jcr-base.git
> > sling-org-apache-sling-jcr-contentparser.git
> > sling-org-apache-sling-jcr-repository-it-resource-versioning.git
> > sling-org-apache-sling-jcr-jackrabbit-usermanager.git
> > sling-org-apache-sling-jcr-jcr-wrapper.git
> > sling-org-apache-sling-jcr-repoinit.git
> > sling-org-apache-sling-jcr-resource.git
> > sling-org-apache-sling-scripting-api.git
> > sling-org-apache-sling-scripting-el-api.git
> > sling-org-apache-sling-scripting-jsp.git
> > sling-org-apache-sling-scripting-sightly-compiler.git
> > sling-org-apache-sling-scripting-sightly.git
> > sling-org-apache-sling-scripting-sightly-testing-content.git
> > sling-org-apache-sling-servlets-get.git
> > sling-org-apache-sling-servlets-resolver.git
> > sling-org-apache-sling-distribution-it.git
> > sling-org-apache-sling-testing-clients.git
> > sling-tooling-jenkins.git
> >
> > After this is fixed, I will complete the rest of the tasks from
> > https:/
> > /issues.apache.org/jira/browse/SLING-3987, but I expect no
> > surprises
> > there.
> >
> > Thanks,
> >
> > Robert
> >
> > On Wed, 2017-10-18 at 21:33 +0200, Robert Munteanu wrote:
> > > Hi,
> > >
> > > As announced, I will start migrating our repositories to git. If
> > > you
> > > have any changes to make in SVN, please commit them in the next
> > > 30
> > > minutes. If something urgent comes up, let me know and I will
> > > delay
> > > the
> > > migration.
> > >
> > > I have already kicked off the SVN → Git conversion script
> > > locally. By
> > > my estimates it will be done in about 3 hours, so in about 3
> > > hours
> > > and
> > > 30 minutes I will start the push to git.
> > >
> > > Note that I will re-do the migration of modules that received
> > > commits
> > > after I started the migration, so no data will be lost in the
> > > meantime.
> > >
> > > Thanks,
> > >
> > > Robert
> >
> >
Re: [git] Migration to git repositories sort of complete (was:
Migration to git starting, please hold commits in 30 minutes from now)
Posted by Ian Boston <ie...@tfd.co.uk>.
Hi,
Thanks for working into the early hours to do this.
So, IIUC, a pull request/patch that was originally against the whole SVN
repo now has to work out which parts are in Git and which parts and in SVN.
For those parts that are in git, apply there are remove from the SVN patch.
Once everything that can be done in git is done, then apply the remaining
SVN patch to SVN.
Since this will not be done in the right order the build in those modules
will break for a short while until the SVN+Git repository reaches its
consistent state (ie eventually consistent), but it will eventually build
if the patches are ok.
Is that the right procedure while Infra fixes the missing repo?
And the right expectation for builds ?
Best Regards
Ian
On 19 October 2017 at 00:42, Robert Munteanu <ro...@apache.org> wrote:
> Hi,
>
> The sources have been migrated from SVN to Git. Unfortunately there was
> a snag ( https://issues.apache.org/jira/browse/INFRA-15308 ) where
> repositories were created on github but not on gitbox, which means that
> these repos are unusable.
>
> Infra is looking into it. In the meantime ( 1-2 days at most hopefully
> ) my proposal is that we live with a split setup and commit to Git
> where migrated or to SVN otherwise. That's a pretty weird setup, but
> otherwise we'll have to drop + recreate all git repositories again, and
> hopefully there won't be too many changes until I can complete the
> migration.
>
> The full list of repositories that were not properly created is:
>
> sling-org-apache-sling-commons-fsclassloader.git
> sling-org-apache-sling-commons-johnzon.git
> sling-org-apache-sling-commons-metrics-rrd4j.git
> sling-org-apache-sling-commons-messaging-mail.git
> sling-org-apache-sling-commons-threads.git
> sling-org-apache-sling-bundleresource-impl.git
> sling-org-apache-sling-caconfig-impl.git
> sling-org-apache-sling-discovery-api.git
> sling-org-apache-sling-discovery-impl.git
> sling-org-apache-sling-event.git
> sling-org-apache-sling-fragment-ws.git
> sling-org-apache-sling-fsresource.git
> sling-org-apache-sling-hc-annotations.git
> sling-org-apache-sling-hc-junit-bridge.git
> sling-org-apache-sling-hc-samples.git
> sling-org-apache-sling-hc-support.git
> sling-org-apache-sling-models-validation-impl.git
> sling-org-apache-sling-repoinit-parser.git
> sling-org-apache-sling-settings.git
> sling-org-apache-sling-validation-api.git
> sling-org-apache-sling-validation-examples.git
> sling-org-apache-sling-validation-test-services.git
> sling-org-apache-sling-extensions-webconsolesecurityprovider.git
> sling-org-apache-sling-jcr-base.git
> sling-org-apache-sling-jcr-contentparser.git
> sling-org-apache-sling-jcr-repository-it-resource-versioning.git
> sling-org-apache-sling-jcr-jackrabbit-usermanager.git
> sling-org-apache-sling-jcr-jcr-wrapper.git
> sling-org-apache-sling-jcr-repoinit.git
> sling-org-apache-sling-jcr-resource.git
> sling-org-apache-sling-scripting-api.git
> sling-org-apache-sling-scripting-el-api.git
> sling-org-apache-sling-scripting-jsp.git
> sling-org-apache-sling-scripting-sightly-compiler.git
> sling-org-apache-sling-scripting-sightly.git
> sling-org-apache-sling-scripting-sightly-testing-content.git
> sling-org-apache-sling-servlets-get.git
> sling-org-apache-sling-servlets-resolver.git
> sling-org-apache-sling-distribution-it.git
> sling-org-apache-sling-testing-clients.git
> sling-tooling-jenkins.git
>
> After this is fixed, I will complete the rest of the tasks from https:/
> /issues.apache.org/jira/browse/SLING-3987, but I expect no surprises
> there.
>
> Thanks,
>
> Robert
>
> On Wed, 2017-10-18 at 21:33 +0200, Robert Munteanu wrote:
> > Hi,
> >
> > As announced, I will start migrating our repositories to git. If you
> > have any changes to make in SVN, please commit them in the next 30
> > minutes. If something urgent comes up, let me know and I will delay
> > the
> > migration.
> >
> > I have already kicked off the SVN → Git conversion script locally. By
> > my estimates it will be done in about 3 hours, so in about 3 hours
> > and
> > 30 minutes I will start the push to git.
> >
> > Note that I will re-do the migration of modules that received commits
> > after I started the migration, so no data will be lost in the
> > meantime.
> >
> > Thanks,
> >
> > Robert
>
>