source code branching

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

source code branching

bwestrich
Kohsuke,

Per your suggestion, I'm forwarding our discussion to the dev list.

Glad you're comfortable with the creation of branches, it will
certainly be a productivity and collaboration boost for me.

I've created a branch of the Perforce plugin named
bwestrich-1-0-3-SNAPSHOT which I'll be using for checking in some work
in progress. When this is ready for prime time, I'll coordinate with
Mike to merge it back to Head.

Brian

---------- Forwarded message ----------
From: Kohsuke Kawaguchi <[hidden email]>
Date: Nov 1, 2007 7:43 PM
Subject: Re: cvs question
To: Mike Wille <[hidden email]>
Cc: Brian Westrich <[hidden email]>



I encourage having this kind of conversations in
[hidden email], so that we can keep this in the archive for
other folks in the future.

As for the branch, please feel free to create as many as you need. I
consider plugin owners to own their parts of the CVS repositories, so
there's no need to check with me about what you do with those.

If you are asking about general things you need to be careful about
creating a CVS branch, that would be to plan for a future merge. For
example, if you have a change in a branch that you plan to merge back
later, then you don't want to do a big refactoring on the trunk. But
then, you two might probably already know those.


And thank you very much for talking to each other and coordinating. I
know it takes conscious effort to do so, and I appreciate both of you
are doing that.


Mike Wille wrote:

> Brian Westrich wrote:
>> Hi Mike,
>>
>> I'm thinking about how I can test the changes we've been talking about
>> related to "first changelist to ignore" (that could be used on p4
>> servers with a large number of changelists). To do this testing, I'll
>> need access to the p4 server at my current contract.
>>
>> I'd like to have the code on my laptop, as that way I can work on it
>> at home. However, my current gig frowns on contractors connecting
>> laptops to the network, so there I'd have to use a different machine
>> to try the code out on the large number of changelists.
>>
>> If I check the code out on both machines, it will be a hassle to keep
>> it in sync across the two machines (unless I commit the code, which I
>> don't want to do without adequate testing). I could deploy the code on
>> the laptop to an hpi file, then copy it (via jump drive) to my desktop
>> machine. But this is also a hassle.
>>
>> My first thought was to create a cvs branch. This way I could just
>> commit the code to this branch and update it from my two machines. I
>> noticed there's already a branch out there named
>> maven-embedder-2-1-SNAPSHOT.  Would you mind if I created another one?
>>
>> If you'd like me to check with others as well on the project related
>> to this, I'd be happy to do so. I don't want to cause any trouble. :-)
>>
>> Thanks,
>>
>> Brian
>>
> Kohsuke is the person to talk to on this.  I've included him on my response.
>
> Kohsuke, what are the guidelines for creating new branches?


--
Kohsuke Kawaguchi
Sun Microsystems                   [hidden email]

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

smime.p7s (4K) Download Attachment
Reply | Threaded
Open this post in threaded view
|

Re: source code branching

Kohsuke Kawaguchi
Administrator

Thanks!

Brian Westrich wrote:

> Kohsuke,
>
> Per your suggestion, I'm forwarding our discussion to the dev list.
>
> Glad you're comfortable with the creation of branches, it will
> certainly be a productivity and collaboration boost for me.
>
> I've created a branch of the Perforce plugin named
> bwestrich-1-0-3-SNAPSHOT which I'll be using for checking in some work
> in progress. When this is ready for prime time, I'll coordinate with
> Mike to merge it back to Head.

--
Kohsuke Kawaguchi
Sun Microsystems                   [hidden email]

smime.p7s (4K) Download Attachment