[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
RE: branches
From: |
Koziel, Ryan |
Subject: |
RE: branches |
Date: |
Fri, 24 Mar 2006 15:28:42 -0600 |
Good info, in addition to what I am finding. Thanks a bunch!
-----Original Message-----
From: address@hidden [mailto:address@hidden On Behalf Of Mark D.
Baushke
Sent: Friday, March 24, 2006 3:26 PM
To: Koziel, Ryan
Cc: address@hidden
Subject: Re: branches
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Koziel, Ryan <address@hidden> writes:
> Is it, in anyone's opinion, a good idea to branch off of a branch?
It can be. For example, if the main trunk is where development occurs
and a branch is where a particular major release is refined, then it may
be desirable to have a branch of that branch to deal with minor
releases.
main trunk: development working toward a stable release 2.0
branch_1: where release 1.x work diverged from 2.x work
branch_1_1: where release 1.1 work diverged from 1.x work
branch_1_1_1: where release 1.1.1 work diverged from 1.1.2 work
branch_1_2: where release 1.2 work diverged from 1.x work
A patch for branch_1_1_1 would probably also go into branch_1_1 and
branch_1_2 and branch_1 and the main trunk. However, it is possible that
the nature of those patches might be different in that the smallest most
conservative change might be used for 1_1_1 while 1_2 might add more
user visible changes and branch_1 or the main trunk might even change
default behaviors.
How deeply branches go would be more a matter of your development
process and workflow than anything else.
Enjoy!
-- Mark
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.2.2 (FreeBSD)
iD8DBQFEJGP6Cg7APGsDnFERAnQiAJ9AkbmauifpuxNQhO2B/XrdHeNO9QCgk5M1
OODRYWtwO/zzQZVpDi4PdD4=
=kU0V
-----END PGP SIGNATURE-----
- branches, Koziel, Ryan, 2006/03/24
- RE: branches, Koziel, Ryan, 2006/03/24
- RE: branches,
Koziel, Ryan <=