-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1
I didn't get any reply on my question about CVS manipulation, so I thought I'd start a new thread.
The HEAD of mock's CVS tree is currently at v0.6. I'd like to branch that so that we have a safe point to drop back to, before we move to the new launcher, add some file locking or whatever we decide to do for reporting status, etc.
To do that, I'm proposing the following in CVS:
$ cvs co mock $ cd mock $ cvs tag mock-0-6-branchpoint $ cvs tag -r mock-0-6-branchpoint -b mock-0-6-branch
Theoretically, this will create a static tag (the branchpoint tag) and then create a branch named mock-0-6-branch, based on the branchpoint tag. We can then do our wild-and-crazy checkins to head and know that we have a safe haven.
I'm not wedded to the names or the methodology (that's just how we tend to manage branches in my group).
If no one has any suggestions or objections, I'll branch later this afternoon (US Central time) and we can start putting the new code in and testing.
Clark
On Tue, 2006-06-27 at 12:07 -0500, Clark Williams wrote:
I'm not wedded to the names or the methodology (that's just how we tend to manage branches in my group).
My feeble brain has a hard time grasping a branch _from_ 0.6 named mock-0-6-branch. Wouldn't we want to name it something that is post 0.6?
-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1
Jesse Keating wrote:
On Tue, 2006-06-27 at 12:07 -0500, Clark Williams wrote:
I'm not wedded to the names or the methodology (that's just how we tend to manage branches in my group).
My feeble brain has a hard time grasping a branch _from_ 0.6 named mock-0-6-branch. Wouldn't we want to name it something that is post 0.6?
I just look at it as a branch that began life at 0.6. I suppose it makes more sense as HEAD progresses on to other versions.
Clark
On Tue, 2006-06-27 at 12:17 -0500, Clark Williams wrote:
Jesse Keating wrote:
On Tue, 2006-06-27 at 12:07 -0500, Clark Williams wrote:
I'm not wedded to the names or the methodology (that's just how we tend to manage branches in my group).
My feeble brain has a hard time grasping a branch _from_ 0.6 named mock-0-6-branch. Wouldn't we want to name it something that is post 0.6?
I just look at it as a branch that began life at 0.6. I suppose it makes more sense as HEAD progresses on to other versions.
... and additional releases from the branch can become 0.6.1, 0.6.2, etc
Makes perfect sense to me.
Jeremy
On Tue, 2006-06-27 at 13:24 -0400, Jeremy Katz wrote:
I just look at it as a branch that began life at 0.6. I suppose it makes more sense as HEAD progresses on to other versions.
... and additional releases from the branch can become 0.6.1, 0.6.2, etc
Makes perfect sense to me.
I'm thtupid. branch-0.6 is for applying stuff to the 0.6 release, while HEAD moves on. I'm going to go stick my head in the vending machine and hope for some caffeine to start thinking clearly.
Looks good to me. -- Michael
-----Original Message----- From: fedora-buildsys-list-bounces@redhat.com on behalf of Clark Williams Sent: Tue 6/27/2006 12:07 PM To: Discussion of Fedora build system Subject: Branch mock CVS today?
-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1
I didn't get any reply on my question about CVS manipulation, so I thought I'd start a new thread.
The HEAD of mock's CVS tree is currently at v0.6. I'd like to branch that so that we have a safe point to drop back to, before we move to the new launcher, add some file locking or whatever we decide to do for reporting status, etc.
To do that, I'm proposing the following in CVS:
$ cvs co mock $ cd mock $ cvs tag mock-0-6-branchpoint $ cvs tag -r mock-0-6-branchpoint -b mock-0-6-branch
Theoretically, this will create a static tag (the branchpoint tag) and then create a branch named mock-0-6-branch, based on the branchpoint tag. We can then do our wild-and-crazy checkins to head and know that we have a safe haven.
I'm not wedded to the names or the methodology (that's just how we tend to manage branches in my group).
If no one has any suggestions or objections, I'll branch later this afternoon (US Central time) and we can start putting the new code in and testing.
Clark
-- Fedora-buildsys-list mailing list Fedora-buildsys-list@redhat.com https://www.redhat.com/mailman/listinfo/fedora-buildsys-list
-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1
Michael_E_Brown@Dell.com wrote:
Looks good to me.
Michael
It's done.
There is now a mock-0-6-branch that we can use if we have to make any emergency fixes to the currently released mock.
I'm getting ready to check in the launcher changes, which are src/mock.c and mods to src/Makefile, as well as changes to mock.py and the top level Makefile and spec file. I'll report to the list when it goes in.
Clark
buildsys@lists.fedoraproject.org
-
Clark Williams -
Jeremy Katz -
Jesse Keating -
Michael E Brown