Perfect.
Thanks
Best Regards
Ian

On 19 October 2017 at 08:34, Robert Munteanu <[email protected]> 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 <[email protected]>
> > 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
> > >
> > >
>
>

Reply via email to