Re: Moving C to its own directory (was Re: ObjC tree inlining)

["Joseph S. Myers" <jsm28 at cam dot ac dot uk>]

On 21 Nov 2001, Karl Fogel wrote:

> Hmmm.  Joseph, I *think* I understand your question below... But would
> you mind re-asking with a small, concrete example tree?  Then we can
> use the dirs and files in that tree to a) make sure we've completely
> understood the question, and b) answer it accurately.

Attached is a tarball with two directories, tree1 and tree2, each
containing a single file,v file.  These files started out of sync, were
changed somewhat, had release branches made (which we suppose are still
active and we might want to make further changes in future), had further
changes on the release branches, then were synchronised on the mainline.
This represents the situation for any file shared between the src and gcc
CVS trees.

What's wanted is to merge them, so that for future development there's a
single mainline that won't get out of sync, but so that all of the
following are also still possible:

* Making changes to the release branch on tree1 or tree2.
* Checking out any past tag or branch from tree1 or tree2.
* Checking out tree1 as of any given date, or tree2 as of any given date.
* Reading the logs for the history of the file in either tree1 or tree2.

As variants, the following cases may also occur:

* A file that was deleted and in the Attic in one tree, but present in the 
other.

* A file that was deleted in both trees and may or may not have had
different contents in each tree when deleted.

* Either of these also applies for files in the Attic not because of
deletion but because of having only been created on a branch.

-- 
Joseph S. Myers
jsm28@cam.ac.uk

Attachment: trees.tar.gz
Description: Binary data