snvkit jenkins fork

classic Classic list List threaded Threaded
4 messages Options
Reply | Threaded
Open this post in threaded view
|

snvkit jenkins fork

nicolas de loof-2
Hi,

svnkit now has an official git mirror : http://svn.svnkit.com/git/svnkit

I've used a graft to reconcile our "incoming" branch with snvkit repo

you can cherry-pick, merge, etc from svnkit branch.
I used this to merge 1.7.6 (deployed as 1.7.6-jenkins-1)

I will also check if we could have (some of) our custom changes backported to svnkit mainstream



Reply | Threaded
Open this post in threaded view
|

Re: snvkit jenkins fork

Jerome Lacoste-3
On Thursday, December 20, 2012 4:52:23 PM UTC+1, nicolas de loof wrote:
Hi,

svnkit now has an official git mirror : http://svn.svnkit.com/git/svnkit

I've used a graft to reconcile our "incoming" branch with snvkit repo

you can cherry-pick, merge, etc from svnkit branch.
I used this to merge 1.7.6 (deployed as 1.7.6-jenkins-1)

I will also check if we could have (some of) our custom changes backported to svnkit mainstream

I got curious to see what the differences where (outside those one can see from the git history of jenkins's svnkit).

For those who haven't noticed, the project config didn't contain a svnkit branch definition, so if you do a

    git diff master svnkit

   svnkit will refer to the svnkit directory. Which leads to unexpected results :)

Doing 

  git checkout --track -b svnkit refs/remotes/origin/svnkit

causes git to then warn about "fatal: ambiguous argument 'svnkit': both revision and filename"

Should we pick a less ambiguous branch name ? maybe upstream or upstream-master ?

Also I noticed that doing a git checkout refs/remotes/origin/svnkit causes EOL modified files to be created (I use core.autocrlf = true in my git global conf). Some gitattributes tuning to do ?

J
Reply | Threaded
Open this post in threaded view
|

Re: snvkit jenkins fork

Christoph Kutzinski
In reply to this post by nicolas de loof-2
Nice.
Is there anything which stops us from using the new version in the
subversion-plugin?

Am 20.12.2012 16:52, schrieb nicolas de loof:

> Hi,
>
> svnkit now has an official git mirror : http://svn.svnkit.com/git/svnkit
>
> I've used a graft to reconcile our "incoming" branch with snvkit repo
> "svnkit" branch on https://github.com/jenkinsci/svnkit is mirroring
> http://svn.svnkit.com/git/svnkit
>
> you can cherry-pick, merge, etc from svnkit branch.
> I used this to merge 1.7.6 (deployed as 1.7.6-jenkins-1)
>
> I will also check if we could have (some of) our custom changes
> backported to svnkit mainstream
>
>
>

Reply | Threaded
Open this post in threaded view
|

Re: snvkit jenkins fork

Vojtech Juranek
In reply to this post by nicolas de loof-2

> I will also check if we could have (some of) our custom changes backported
> to svnkit mainstream

that would be nice. Is there any reason why not to push into upstream all
changes?
I think about packaging Jenkins into Fedora and these forks are what I'm most
worried about

Btw: do we track somewhere list of forks? Some time ago I checked the
dependencies and found (IIRC) about 20 forked projects