Hello info-cvs,
attached is a wincvs graph of a file:
(See attached file: mismerge.zip)
but in order to elaborate I will try to sum it up:
we have the trunk and 2 branches
version
1.10
1.11 has tags MERGE_0
MERGE_1
MERGE_DM_2
and branch tag FIX
1.12
1.13 has tag MERGED_1
and branch tag FIX_5_1
1.13.2.1 has tags MERGED_DM_2
FIX_5_1_MERGE_EURO_0
FIX_5_1_MERGE_EURO_1
1.14 has tag FIX_5_1_MERGED_EURO_1
Here is what we did:
1. until 1.10 we worked on the trunk
2. we then created a branch on which bugfixes were to occur (FIX was the branch tag)
3. when we wanted to merge we marked the branch MERGE_0, MERGE_1 for late comers
4. on the trunk we then did an update against the tag version MERGE_1, work continued
on branch FIX and trunk (DEV).
5. at a later point we needed another branch (another version delivered), branch tag
FIX_5_1.
6. we merged the FIX branch to the FIX_5_1 branch by updating against the difference
between MERGE_1 and MERGE_DM_2
(the head of FIX) (= 1.13.2.1 labelled MERGED_DM_2)
7. after that we merged the difference between FIX_5_1 and FIX_5_1_MERGE_EURO_1 to
the trunk (1.14 FIX_5_1_MERGED_EURO_1).
Now since 1.11 branches FIX without any versions on the branch, merging FIX to FIX_5_1
(4.-5.) this was unfortunately equivalent to ROLLING
BACK to a previous version, eliminating changes (insertion of a function) in 1.13.
-->> Where do we abuse CVS. Intended was a right to left merging of branches to the
trunk, NOT the rollback ???
This was just an example -- other things failed as well.
sincerely,
Tom Heinrich
[EMAIL PROTECTED]
--
Diese E-Mail enth�lt vertrauliche und/oder rechtlich gesch�tzte Informationen. Wenn
Sie nicht der richtige Adressat sind oder diese E-Mail irrt�mlich erhalten haben,
informieren Sie bitte sofort den Absender und vernichten Sie diese Mail. Das
unerlaubte Kopieren sowie die unbefugte Weitergabe dieser Mail ist nicht gestattet.
This e-mail may contain confidential and/or privileged information. If you are not the
intended recipient (or have received this e-mail in error) please notify the sender
immediately and destroy this e-mail. Any unauthorized copying, disclosure or
distribution of the material in this e-mail is strictly forbidden.
=?iso-8859-1?Q?mismerge.zip?=
Description: Zip archive
