[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: How should one maintain a branch for development of a major feature?

From: Jim Hyslop
Subject: Re: How should one maintain a branch for development of a major feature?
Date: Mon, 10 Oct 2005 10:53:44 -0400
User-agent: Mozilla Thunderbird 1.0.6 (Windows/20050716)

Douglas Wade Needham wrote:
Unfortunately, doing that with our project could prove difficult.

Ah, I thought the branch had not yet been set up. If you've already set up the branch and are working on it, then it's best to leave things as they are.
Better yet...just setup a separate test repository, possibly cloning
our real repository into it, and doing it that way.  Given I spent
much of the past several months doing this while trying to import
several revisions of an RT OS toolkit (2GB across 18K files, mostly
binary) only to have several Linux machines exhibit the same random
but frequent crash/reboot issue, I definitely know how to do that.

Sure, whatever works best for you.

2) Am I correct in my thinking that if I merge in either direction,
  the latest merge tags in the mainline and branch should be

I know where my confusion was - what exactly do you mean by the tags being synchronized?

Here is a sample (totally hypothetical) graph, but the end result is
pretty much that they will eventually be the same.  I use '*' to
indicate the hypothetical file revisions.

*----*---*--*----*---*--*-*-*--*----*------* DEV
           /         ^   \      ^          ^            \
/ | v / / v ------*--*---*----*----*---*----------*--*-----*-------*--- MAIN
                 \                        \                \
                  \                        \                \
                   *---- RELx               *---- RELy       *-- RELz


reply via email to

[Prev in Thread] Current Thread [Next in Thread]