Manage our forks as ... git forks

130 views
Skip to first unread message

nicolas de loof

unread,
Sep 30, 2016, 4:32:04 PM9/30/16
to jenkin...@googlegroups.com
Hi,

Jenkins uses some custom builds of external libraries, typically XStream.
Today such projects are hosted on github, which would make easier to keep in sync and/or propose fixes to upstream project. But we can't reconcile existing repository with project's github.

Typical sample : 

I suggest we rename such a repo on jenkinsci organization as "-legacy", then fork the upstream project, and apply a diff to ensure we get our own changes back (or maybe try to cherry-pick patches, which would be nicer but more complex).

We could then ensure PR made to jenkinsci are also proposed to upstream project and we only include fixes that are strictly related to jenkins usage, or at least changes we approved might be included in a future upstream project release

wdyt ?


Mark Waite

unread,
Sep 30, 2016, 5:35:35 PM9/30/16
to jenkin...@googlegroups.com
Wouldn't it be better to leave the existing repository with its current name to prevent breaking anyone who depends on that location, then create the forked repository under an entirely new name (like xstream-fork)?

Other than that minor item, I think it is an interesting idea to clearly show projects which are forks of an upstream project.

Mark Waite

--
You received this message because you are subscribed to the Google Groups "Jenkins Developers" group.
To unsubscribe from this group and stop receiving emails from it, send an email to jenkinsci-de...@googlegroups.com.
To view this discussion on the web visit https://groups.google.com/d/msgid/jenkinsci-dev/CANMVJznvDaPk0t%2BMTbgDmiHb34eGZUT%3DLZJVCjd2VOcEcgDsyw%40mail.gmail.com.
For more options, visit https://groups.google.com/d/optout.

nicolas de loof

unread,
Oct 3, 2016, 4:16:17 AM10/3/16
to jenkin...@googlegroups.com
I've created https://github.com/jenkinsci/xstream-fork, branch "jenkins" is based on upstream tag 1.4.7 + diff from our fork, so code is equivalent to https://github.com/jenkinsci/xstream

Are you OK I documented on jenkinsci/xstream this repo is deprecated and redirect users to jenkinsci/xstream-fork if they want to propose PRs ?


2016-09-30 23:35 GMT+02:00 Mark Waite <mark.ea...@gmail.com>:
Wouldn't it be better to leave the existing repository with its current name to prevent breaking anyone who depends on that location, then create the forked repository under an entirely new name (like xstream-fork)?

Other than that minor item, I think it is an interesting idea to clearly show projects which are forks of an upstream project.

Mark Waite

On Fri, Sep 30, 2016 at 2:32 PM nicolas de loof <nicolas...@gmail.com> wrote:
Hi,

Jenkins uses some custom builds of external libraries, typically XStream.
Today such projects are hosted on github, which would make easier to keep in sync and/or propose fixes to upstream project. But we can't reconcile existing repository with project's github.

Typical sample : 

I suggest we rename such a repo on jenkinsci organization as "-legacy", then fork the upstream project, and apply a diff to ensure we get our own changes back (or maybe try to cherry-pick patches, which would be nicer but more complex).

We could then ensure PR made to jenkinsci are also proposed to upstream project and we only include fixes that are strictly related to jenkins usage, or at least changes we approved might be included in a future upstream project release

wdyt ?


--
You received this message because you are subscribed to the Google Groups "Jenkins Developers" group.
To unsubscribe from this group and stop receiving emails from it, send an email to jenkinsci-dev+unsubscribe@googlegroups.com.

To view this discussion on the web visit https://groups.google.com/d/msgid/jenkinsci-dev/CANMVJznvDaPk0t%2BMTbgDmiHb34eGZUT%3DLZJVCjd2VOcEcgDsyw%40mail.gmail.com.
For more options, visit https://groups.google.com/d/optout.

--
You received this message because you are subscribed to the Google Groups "Jenkins Developers" group.
To unsubscribe from this group and stop receiving emails from it, send an email to jenkinsci-dev+unsubscribe@googlegroups.com.
To view this discussion on the web visit https://groups.google.com/d/msgid/jenkinsci-dev/CAO49JtGPpRL%3Dh0kHeQ2Lh4isi6eNrboSZYhzRMdx9PRm%2Bghz6A%40mail.gmail.com.

Kanstantsin Shautsou

unread,
Oct 3, 2016, 7:03:54 AM10/3/16
to Jenkins Developers
+1 Url in top of page should be enough imho.
Maybe name repository `xstream-jenkins` as project do `-jenkins` releases?


On Monday, October 3, 2016 at 11:16:17 AM UTC+3, nicolas de loof wrote:
I've created https://github.com/jenkinsci/xstream-fork, branch "jenkins" is based on upstream tag 1.4.7 + diff from our fork, so code is equivalent to https://github.com/jenkinsci/xstream

Are you OK I documented on jenkinsci/xstream this repo is deprecated and redirect users to jenkinsci/xstream-fork if they want to propose PRs ?

2016-09-30 23:35 GMT+02:00 Mark Waite <mark.ea...@gmail.com>:
Wouldn't it be better to leave the existing repository with its current name to prevent breaking anyone who depends on that location, then create the forked repository under an entirely new name (like xstream-fork)?

Other than that minor item, I think it is an interesting idea to clearly show projects which are forks of an upstream project.

Mark Waite

On Fri, Sep 30, 2016 at 2:32 PM nicolas de loof <nicolas...@gmail.com> wrote:
Hi,

Jenkins uses some custom builds of external libraries, typically XStream.
Today such projects are hosted on github, which would make easier to keep in sync and/or propose fixes to upstream project. But we can't reconcile existing repository with project's github.

Typical sample : 

I suggest we rename such a repo on jenkinsci organization as "-legacy", then fork the upstream project, and apply a diff to ensure we get our own changes back (or maybe try to cherry-pick patches, which would be nicer but more complex).

We could then ensure PR made to jenkinsci are also proposed to upstream project and we only include fixes that are strictly related to jenkins usage, or at least changes we approved might be included in a future upstream project release

wdyt ?


--
You received this message because you are subscribed to the Google Groups "Jenkins Developers" group.
To unsubscribe from this group and stop receiving emails from it, send an email to jenkinsci-de...@googlegroups.com.

--
You received this message because you are subscribed to the Google Groups "Jenkins Developers" group.
To unsubscribe from this group and stop receiving emails from it, send an email to jenkinsci-de...@googlegroups.com.

Baptiste Mathus

unread,
Oct 3, 2016, 7:57:47 AM10/3/16
to Jenkins Developers
Maybe GitHub could just set up the link on existing repos to [conceptually] forked ones? I've asked them on Twitter to see if they have an answer. Might be possible, since the contrary is and we regularly ask them to "break" fork links.

To unsubscribe from this group and stop receiving emails from it, send an email to jenkinsci-dev+unsubscribe@googlegroups.com.
 To view this discussion on the web visit https://groups.google.com/d/msgid/jenkinsci-dev/4feee351-d040-4782-8876-a90034266d12%40googlegroups.com.

Kanstantsin Shautsou

unread,
Oct 3, 2016, 7:58:50 AM10/3/16
to jenkin...@googlegroups.com
Just write to support, they react really fast and solve issues.

You received this message because you are subscribed to a topic in the Google Groups "Jenkins Developers" group.
To unsubscribe from this topic, visit https://groups.google.com/d/topic/jenkinsci-dev/nZvl6Ra3P-M/unsubscribe.
To unsubscribe from this group and all its topics, send an email to jenkinsci-de...@googlegroups.com.
To view this discussion on the web visit https://groups.google.com/d/msgid/jenkinsci-dev/CANWgJS5Yas1u4WU8wPRNnNr9vG-QX8J-DT-K8TqmQo2gGbyc3Q%40mail.gmail.com.
signature.asc

Baptiste Mathus

unread,
Oct 3, 2016, 8:09:33 AM10/3/16
to Jenkins Developers
Yup. Just asked through the GitHub support UI. 

Then if we agree, I guess we'll just be left with creating the list of repos to "reconcile" and issue a support request to batch update them via support.

WDYT?

Cheers


2016-10-03 13:58 GMT+02:00 Kanstantsin Shautsou <kanstan...@gmail.com>:
Just write to support, they react really fast and solve issues.
On Oct 3, 2016, at 14:57, Baptiste Mathus <m...@batmat.net> wrote:

Maybe GitHub could just set up the link on existing repos to [conceptually] forked ones? I've asked them on Twitter to see if they have an answer. Might be possible, since the contrary is and we regularly ask them to "break" fork links.
To unsubscribe from this group and all its topics, send an email to jenkinsci-dev+unsubscribe@googlegroups.com.

--
You received this message because you are subscribed to the Google Groups "Jenkins Developers" group.
To unsubscribe from this group and stop receiving emails from it, send an email to jenkinsci-dev+unsubscribe@googlegroups.com.
To view this discussion on the web visit https://groups.google.com/d/msgid/jenkinsci-dev/E08ED313-ECA5-4720-97A5-5B8DF17EFC22%40gmail.com.

Kanstantsin Shautsou

unread,
Oct 3, 2016, 8:15:32 AM10/3/16
to jenkin...@googlegroups.com
Maybe try firstly try only with this repo?

To unsubscribe from this group and all its topics, send an email to jenkinsci-de...@googlegroups.com.
To view this discussion on the web visit https://groups.google.com/d/msgid/jenkinsci-dev/CANWgJS5mR0fm%3DgxA%2BMHN8j9heYVEOzN%3D8FzjVn47YHrZ_wxHdA%40mail.gmail.com.
signature.asc

nicolas de loof

unread,
Oct 3, 2016, 8:22:36 AM10/3/16
to jenkin...@googlegroups.com
Our custom fork don't share any commit with the x-stream one as we only imported xstream releases to "incoming" branch. So we don't share history and there's nothing we could link to.

I've tried to use git grafts to re-attach xstream recent commits to Jenkins repo, but didn't got it to work, and also grafts can't be pushed to github (this is a local hack)


To unsubscribe from this group and all its topics, send an email to jenkinsci-dev+unsubscribe@googlegroups.com.

--
You received this message because you are subscribed to the Google Groups "Jenkins Developers" group.
To unsubscribe from this group and stop receiving emails from it, send an email to jenkinsci-dev+unsubscribe@googlegroups.com.
To view this discussion on the web visit https://groups.google.com/d/msgid/jenkinsci-dev/C7551ABF-2EEA-40AA-9690-34CA55AA4EB1%40gmail.com.

Kanstantsin Shautsou

unread,
Oct 3, 2016, 8:30:15 AM10/3/16
to jenkin...@googlegroups.com
But you can create scratch branch and import anything into?


To unsubscribe from this group and all its topics, send an email to jenkinsci-de...@googlegroups.com.
To view this discussion on the web visit https://groups.google.com/d/msgid/jenkinsci-dev/CANMVJz%3DNMG6xT5VC3si2jG7QU6JwW4SJA%2BquNf6TP-nGVim_SA%40mail.gmail.com.
signature.asc

nicolas de loof

unread,
Oct 3, 2016, 8:41:14 AM10/3/16
to jenkin...@googlegroups.com
Not sure I understand your suggestion, how would this help get commits back and forth jenkins and xstream plugin ?



To unsubscribe from this group and all its topics, send an email to jenkinsci-dev+unsubscribe@googlegroups.com.

--
You received this message because you are subscribed to the Google Groups "Jenkins Developers" group.
To unsubscribe from this group and stop receiving emails from it, send an email to jenkinsci-dev+unsubscribe@googlegroups.com.
To view this discussion on the web visit https://groups.google.com/d/msgid/jenkinsci-dev/3EE018B5-FF05-4306-A585-322CBB55A8F7%40gmail.com.

Kanstantsin Shautsou

unread,
Oct 3, 2016, 8:46:04 AM10/3/16
to jenkin...@googlegroups.com
I mean utilise existing repo instead of creating new. Everything the same that would be done in new repo, but in old. 

To unsubscribe from this group and all its topics, send an email to jenkinsci-de...@googlegroups.com.
To view this discussion on the web visit https://groups.google.com/d/msgid/jenkinsci-dev/CANMVJznNy52XSaiYjm_jFU_uywDUvafV%3DReyurR4XB%2BjkgGniw%40mail.gmail.com.
signature.asc

nicolas de loof

unread,
Oct 3, 2016, 8:52:52 AM10/3/16
to jenkin...@googlegroups.com
I'm not sure we can get such a repo easily configured as a fork from xstream
Also, this wouldn't help much to maintain our commits as we would then have two independent commit trees in the same repo

Anyway, if this is considered a better approach, I'm fine with it

To unsubscribe from this group and all its topics, send an email to jenkinsci-dev+unsubscribe@googlegroups.com.

--
You received this message because you are subscribed to the Google Groups "Jenkins Developers" group.
To unsubscribe from this group and stop receiving emails from it, send an email to jenkinsci-dev+unsubscribe@googlegroups.com.
To view this discussion on the web visit https://groups.google.com/d/msgid/jenkinsci-dev/FF529BE8-B1E6-4BC8-99DB-810EAE48337C%40gmail.com.

Baptiste Mathus

unread,
Oct 3, 2016, 3:05:54 PM10/3/16
to Jenkins Developers
So, anyway, now we know. It's not possible to attach a fork afterwards.

To view this discussion on the web visit https://groups.google.com/d/msgid/jenkinsci-dev/CANMVJz%3DpVJRNqDf%3DoY%2BX3bC%3DPiT9Ro01D7uiwXyzxs8C6x4bjg%40mail.gmail.com.

Kanstantsin Shautsou

unread,
Oct 3, 2016, 3:07:02 PM10/3/16
to jenkin...@googlegroups.com
Backup, delete, fork, push back?

To unsubscribe from this group and all its topics, send an email to jenkinsci-de...@googlegroups.com.
To view this discussion on the web visit https://groups.google.com/d/msgid/jenkinsci-dev/CANWgJS6d3A-WFZ9WiAT-YNuYbJag1S%2BB3zU-ALNYje914XTmZw%40mail.gmail.com.
signature.asc

nicolas de loof

unread,
Oct 3, 2016, 3:10:50 PM10/3/16
to jenkin...@googlegroups.com

My initial proposal was to rename existing as -legacy, which would result in something comparable.


Le 3 oct. 2016 9:07 PM, "Kanstantsin Shautsou" <kanstan...@gmail.com> a écrit :
Backup, delete, fork, push back?
On Oct 3, 2016, at 22:05, Baptiste Mathus <m...@batmat.net> wrote:

So, anyway, now we know. It's not possible to attach a fork afterwards.
2016-10-03 14:52 GMT+02:00 nicolas de loof <nicolas...@gmail.com>:
I'm not sure we can get such a repo easily configured as a fork from xstream
Also, this wouldn't help much to maintain our commits as we would then have two independent commit trees in the same repo

Anyway, if this is considered a better approach, I'm fine with it
To unsubscribe from this group and all its topics, send an email to jenkinsci-dev+unsubscribe@googlegroups.com.

--
You received this message because you are subscribed to the Google Groups "Jenkins Developers" group.
To unsubscribe from this group and stop receiving emails from it, send an email to jenkinsci-dev+unsubscribe@googlegroups.com.
To view this discussion on the web visit https://groups.google.com/d/msgid/jenkinsci-dev/22E26022-5055-4011-8E1E-51837B621AFF%40gmail.com.

Kanstantsin Shautsou

unread,
Oct 3, 2016, 3:11:42 PM10/3/16
to jenkin...@googlegroups.com
Rename will keep redirect, so not sure.

To unsubscribe from this group and all its topics, send an email to jenkinsci-de...@googlegroups.com.
To view this discussion on the web visit https://groups.google.com/d/msgid/jenkinsci-dev/CANMVJznwjis%2BPSPiBnQKEqv_DQxSCtbonRgP%2BP%2B4JxBSd%3DLOWQ%40mail.gmail.com.
signature.asc

Oleg Nenashev

unread,
Mar 2, 2017, 5:05:02 AM3/2/17
to Jenkins Developers
I do not feel this change has been discussed enough before applying.
I'm fine if we keep the current state if nobody objects.

понедельник, 3 октября 2016 г., 21:11:42 UTC+2 пользователь Kanstantsin Shautsou написал:


-- 
You received this message because you are subscribed to a topic in the Google Groups "Jenkins Developers" group.
To unsubscribe from this topic, visit https://groups.google.com/d/topic/jenkinsci-dev/nZvl6Ra3P-M/unsubscribe.
To unsubscribe from this group and all its topics, send an email to jenkinsci-de...@googlegroups.com.

-- 
You received this message because you are subscribed to the Google Groups "Jenkins Developers" group.
To unsubscribe from this group and stop receiving emails from it, send an email to jenkinsci-de...@googlegroups.com.

-- 
You received this message because you are subscribed to a topic in the Google Groups "Jenkins Developers" group.
To unsubscribe from this topic, visit https://groups.google.com/d/topic/jenkinsci-dev/nZvl6Ra3P-M/unsubscribe.
To unsubscribe from this group and all its topics, send an email to jenkinsci-de...@googlegroups.com.

-- 
You received this message because you are subscribed to the Google Groups "Jenkins Developers" group.
To unsubscribe from this group and stop receiving emails from it, send an email to jenkinsci-de...@googlegroups.com.

-- 
You received this message because you are subscribed to a topic in the Google Groups "Jenkins Developers" group.
To unsubscribe from this topic, visit https://groups.google.com/d/topic/jenkinsci-dev/nZvl6Ra3P-M/unsubscribe.
To unsubscribe from this group and all its topics, send an email to jenkinsci-de...@googlegroups.com.

-- 
You received this message because you are subscribed to the Google Groups "Jenkins Developers" group.
To unsubscribe from this group and stop receiving emails from it, send an email to jenkinsci-de...@googlegroups.com.

-- 
You received this message because you are subscribed to a topic in the Google Groups "Jenkins Developers" group.
To unsubscribe from this topic, visit https://groups.google.com/d/topic/jenkinsci-dev/nZvl6Ra3P-M/unsubscribe.
To unsubscribe from this group and all its topics, send an email to jenkinsci-de...@googlegroups.com.

-- 
You received this message because you are subscribed to the Google Groups "Jenkins Developers" group.
To unsubscribe from this group and stop receiving emails from it, send an email to jenkinsci-de...@googlegroups.com.

-- 
You received this message because you are subscribed to the Google Groups "Jenkins Developers" group.
To unsubscribe from this group and stop receiving emails from it, send an email to jenkinsci-de...@googlegroups.com.

-- 
You received this message because you are subscribed to a topic in the Google Groups "Jenkins Developers" group.
To unsubscribe from this topic, visit https://groups.google.com/d/topic/jenkinsci-dev/nZvl6Ra3P-M/unsubscribe.
To unsubscribe from this group and all its topics, send an email to jenkinsci-de...@googlegroups.com.

--
You received this message because you are subscribed to the Google Groups "Jenkins Developers" group.
To unsubscribe from this group and stop receiving emails from it, send an email to jenkinsci-de...@googlegroups.com.
Reply all
Reply to author
Forward
0 new messages