problem with jenkins and cvs

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

problem with jenkins and cvs

Masternoob
CONTENTS DELETED
The author has deleted this message.
Reply | Threaded
Open this post in threaded view
|

Re: problem with jenkins and cvs

Tim Pizey-2
On 9 March 2011 13:32, Masternoob  wrote:
> I have one major version and a feature update currently in developement. lets
> say the major version is 1.0 and my update is 1.1 (2.0 already exists.) When
> I make a change (commit) in v1.0 then I merge (and then commit) it to 1.1
> and then to 2.0.
>
> How can I build my update with jenkins and just have the changes in my
> update that were made for 1.1, and not the changes that I merged from 1.0?
>


Sorry to be flipant but
http://www.kernel.org/pub/software/scm/git/docs/git-cvsimport.html is
your friend.
(I speak as a long time CVS user who is loving git.)

cheers
Tim

--
Tim Pizey - http://pizey.net/~timp
Centre for Genomics and Global Health - http://cggh.org
Reply | Threaded
Open this post in threaded view
|

Re: problem with jenkins and cvs

Masternoob
CONTENTS DELETED
The author has deleted this message.
Reply | Threaded
Open this post in threaded view
|

RE: problem with jenkins and cvs

Swindells, Thomas
I think the difference is is that in CVS if you edit multiple parts of the tree they are just edits to multiple parts of the tree, there is no way for a tool to know that the update to branch 2 is actually the same as the update that was done to branch 1.

With git the approach you would write the patch on the oldest branch. You then use git cherry-pick to pick the change on to each of the newer branches. I believe this actually maintains more details about the change that you are applying so that tools can see the fact it is the same commit in multiple places. Whether this actually solves your problem or not I don't know but it will probably get you closer - as in CVS it is pretty much impossible.


*I've never actually done this but believe what I'm saying is roughly correct - http://technosophos.com/content/git-cherry-picking-move-small-code-patches-across-branches


> -----Original Message-----
> From: [hidden email] [mailto:jenkinsci-
> [hidden email]] On Behalf Of Masternoob
> Sent: 10 March 2011 00:39
> To: [hidden email]
> Subject: Re: problem with jenkins and cvs
>
> thank you but i dont understand how i can solve my problem if i use git
> insted of cvs...
>
> could you please explain to me how my branch structure and merging
> should be
> in git so that i can solve my problem?
>
> thx :>
>
> --
> View this message in context:
> http://jenkins.361315.n4.nabble.com/problem-with-jenkins-and-cvs-
> tp3343590p3344932.html
> Sent from the Jenkins users mailing list archive at Nabble.com.


**************************************************************************************
This message is confidential and intended only for the addressee. If you have received this message in error, please immediately notify the [hidden email] and delete it from your system as well as any copies. The content of e-mails as well as traffic data may be monitored by NDS for employment and security purposes. To protect the environment please do not print this e-mail unless necessary.

NDS Limited. Registered Office: One London Road, Staines, Middlesex, TW18 4EX, United Kingdom. A company registered in England and Wales. Registered no. 3080780. VAT no. GB 603 8808 40-00
**************************************************************************************