Project with mixed trunk and branch checkout

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

Project with mixed trunk and branch checkout

Jesse Glick
For little temporary projects I often find myself wanting to run a build
from a mixture of CVS trunk and branch. For example, NetBeans IDE
development builds, using the CVS trunk, use hundreds of megs of disk
space for sources. Branching all of these sources for a small project is
impractical - it would take hours just to make the branch tag, and every
routine merge to keep up to date with the trunk would take hours more.
So we usually branch just a few CVS modules (or even parts of them, if
the top-level modules are big) and take everything else from the trunk.
Of course you need to be a little careful (changes in the trunk might
suddenly break something you are doing in a branch) but usually this
approach is quite practical.

Unfortunately I cannot figure out how to set up such a build in Hudson
in a way that preserves the changelog. I cannot select the CVS option in
Hudson with Checkout, since that provides no way to set a branch. I
cannot manually do an initial checkout with the correct mixture and then
leave the branch field blank and check Use Update - although Hudson
would probably do the update correctly (does not pass -A) the changelog
would contain only trunk changes, not the branch changes I am interested
in. To date I have just turned off CVS mode entirely and included CVS
commands in the build script. This works but no changelog is available.

Has anyone else run across the same problem? Do you know of a
workaround? I doubt Hudson should natively support this scenario as I
suspect it is unusual.

-J.

--
[hidden email]  netbeans.org  ant.apache.org  hudson.dev.java.net
             http://google.com/search?q=e%5E%28pi*i%29%2B1

---------------------------------------------------------------------
To unsubscribe, e-mail: [hidden email]
For additional commands, e-mail: [hidden email]

Reply | Threaded
Open this post in threaded view
|

Re: Project with mixed trunk and branch checkout

Kohsuke Kawaguchi
Administrator
I'm curious why Hudson wouldn't compute the correct changelog.

Ah, that's because when it computes the changelog it specifies the
branch explicitly? Maybe it just needs to check CVS/Tag file and run
cvs log command accordingly, one branch at a time?

2007/4/30, Jesse Glick <[hidden email]>:

> For little temporary projects I often find myself wanting to run a build
> from a mixture of CVS trunk and branch. For example, NetBeans IDE
> development builds, using the CVS trunk, use hundreds of megs of disk
> space for sources. Branching all of these sources for a small project is
> impractical - it would take hours just to make the branch tag, and every
> routine merge to keep up to date with the trunk would take hours more.
> So we usually branch just a few CVS modules (or even parts of them, if
> the top-level modules are big) and take everything else from the trunk.
> Of course you need to be a little careful (changes in the trunk might
> suddenly break something you are doing in a branch) but usually this
> approach is quite practical.
>
> Unfortunately I cannot figure out how to set up such a build in Hudson
> in a way that preserves the changelog. I cannot select the CVS option in
> Hudson with Checkout, since that provides no way to set a branch. I
> cannot manually do an initial checkout with the correct mixture and then
> leave the branch field blank and check Use Update - although Hudson
> would probably do the update correctly (does not pass -A) the changelog
> would contain only trunk changes, not the branch changes I am interested
> in. To date I have just turned off CVS mode entirely and included CVS
> commands in the build script. This works but no changelog is available.
>
> Has anyone else run across the same problem? Do you know of a
> workaround? I doubt Hudson should natively support this scenario as I
> suspect it is unusual.
>
> -J.
>
> --
> [hidden email]  netbeans.org  ant.apache.org  hudson.dev.java.net
>              http://google.com/search?q=e%5E%28pi*i%29%2B1
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: [hidden email]
> For additional commands, e-mail: [hidden email]
>
>


--
Kohsuke Kawaguchi

---------------------------------------------------------------------
To unsubscribe, e-mail: [hidden email]
For additional commands, e-mail: [hidden email]

Reply | Threaded
Open this post in threaded view
|

Re: Project with mixed trunk and branch checkout

Jesse Glick
Kohsuke Kawaguchi wrote:
> I'm curious why Hudson wouldn't compute the correct changelog.
>
> Ah, that's because when it computes the changelog it specifies the
> branch explicitly?

Right.

My colleague Andrei Badea filed

https://hudson.dev.java.net/issues/show_bug.cgi?id=528

-J.

--
[hidden email]  netbeans.org  ant.apache.org  hudson.dev.java.net
             http://google.com/search?q=e%5E%28pi*i%29%2B1

---------------------------------------------------------------------
To unsubscribe, e-mail: [hidden email]
For additional commands, e-mail: [hidden email]