That is correct.  I suspect that after we release 1.2 we'll delete the dead-1.2 
branch

Bruce Snyder wrote:
On 5/22/06, Matt Hogstrom <[EMAIL PROTECTED]> wrote:
Jason replied on another thread that he prefers to stay with 1.2 for the release.

Here is the proposed nomenclature

trunk           (stays 1.2 but is completely replaced with branches/1.1)
branches/1.1    unchanged
branches/dead-1.2 (is  a copy of the original trunk)

I think that incorporates the thinking so far.  I like it.

Just so I'm clear, the idea is that anyone who put changes into the
current trunk (what will be branches/dead-1.2) will need to harvest
those changes themselves to be put back into the new trunk or
elsewhere, correct?

Bruce

Reply via email to