Maybe this is a trivial matter, but here it is:
We develop in WinCVS on the main trunk and say we arrive at ver 1.4 of
file.c.
Then we create a branch, named my_branch, and Team A starts working
on it. As a result of this work, some lines are added, some are modified
and some other are deleted from the initial revision of file.c.
Team B goes on on the main trunk, does a similar job as Team A and
checks in, at the end, version 1.5.
Now the two teams prepare from a merge from my_branch to the main trunk.
How is the merge done, in detail ??
In our experience it seems that lines that are DELETED while working on the
branch
versions REAPPEAR after the merge if these ARE STILL present in the main
trunk
versions. Should this be outlined as a "whole line" conflict ?
So, what kind of merge is this ? In other words, what are exactly the merge
rules ?
We have carefully looked at the Cederqvist, but we did not find a suitable
answer to
our doubts. This is very important for us since if we do not clearly
understand
what is behind the merge command we feel a little unconfident in the merge
operation, which is not frequent in our environment but sometimes really
necessary.
By the way, is it possible to integrate in WinCVS an external merge tool (
such as
AraxisMerge ) the same way it is possible to integrate an external diff tool
?
Thanks in advance for any kind of help.
Regards to all,
Aldo Borrione
--------------------------------------------
Aldo BORRIONE
Centro Ricerche FIAT
Direzione Sistemi Elettronici
DSS-Progettazione Software
Tel: +39.011.9083.945
Fax: +39.011.9083.083
Email: [EMAIL PROTECTED]
--------------------------------------------
