[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: Where can i found some merging information ?
From: |
david |
Subject: |
Re: Where can i found some merging information ? |
Date: |
Mon, 12 May 2003 13:54:49 -0500 (CDT) |
> Hi,
>
> Suppose that development continues on the `R1fix' branch:
>
> +-----+ +-----+ +-----+ +-----+ +-----+
> ! 1.1 !----! 1.2 !----! 1.3 !----! 1.4 !----! 1.5 ! <- The main trunk
> +-----+ +-----+ +-----+ +-----+ +-----+
> ! *
> ! *
> ! +---------+ +---------+ +---------+ +---------+
> Branch R1fix -> +---! 1.2.2.1 !----! 1.2.2.2 !----! 1.2.2.3 !----! 1.2.2.4
> !----
> +---------+ +---------+ +---------+ +---------+
>
> How can i know what was the last merging to the main trunk ? (1.2.2.2)
> if i need to do another merge...
>
Unfortunately, you need to keep track of that yourself. This is how
we did it at the last installation I managed:
Every branch would have its branch tag, of course (and should probably
have had a branch base tag, but we never used one of those). It would
also have its _MERGED tag, such as R1fix_MERGED, and that was kept
at the last revision merged into the trunk. We used a Perl script
to do the merging that would merge from _MERGED to the tip of the branch
and update the _MERGED tag. (We had another one to move the _MERGED
tag without any merging, in the case of a change that should not
be merged to the trunk.)
It worked very well, once the Perl scripts were in place and everybody
started using them.
--
Now building a CVS reference site at http://www.thornleyware.com
address@hidden