On Mon, Dec 7, 2009 at 12:23 PM, Alan D. Cabrera <[email protected]> wrote: > If one uses a branch name branches/1.x and let's say that 1.0, 1.1, and 1.2 > have been released, what do you do when you need to patch 1.1? When you
When 1.1.0 is released, a 1.1.x branch is created (or it's created later from 1.1.0 tag when needed). Once we release 1.0.0, we could either immediately create 1.0.x branch and prepare trunk for 1.1.0 development, or we prepare trunk for 1.0.1 development and branch the same way later as needed. > make this 1.x branch what goes into trunk? If there's a 1.x branch, it implies that trunk has already moved to 2.x (following the release branch pattern - the version "farthest out" is in the trunk). The x in the branch name denotes "the trunk for all versions of <version>.x" Kalle
