With ClearCase, you either have to resolve the conflict at that time or abort
the entire merge. If you're merging, say, asdf.c with asdf@@/main/LATEST, I've
found you could do something like:
(diff3 asdf.c `ct des -anc -s asdf.c asdf.c@@/main/LATEST` asdf.c@@/main/LATEST;
echo w; echo q; echo '1,$p') | ed -
You can then create a Merge hyperlink manually (although this won't prevent
conflicts in future merges).
I might've screwed up some of the syntax (and I've found that different diff3
versions behave a little differently) so experiment with it a bit.
Since we're on this topic, does anyone know if it's possible to write a merge
trigger that would do this kind of merging automatically?
I don't have any suggestions for binary files.
Noel
Julie.Leong@npassage.com on 2000.09.08 12:02:30
To: lgiles@avici.com, Julie.Leong@npassage.com
cc: cciug@rational.com (bcc: Noel L Yap)
Subject: RE: [cciug] merging tools
Well, I'm using ClearCase 3.2.1 and I don't think is change in 4.0
The problem that I don't like clearcase merge tool is that when you merge
there are conflicts and you have to resolve. Sometime there a space or same
line of code get confuss. That's the reason I need to find a better merge
tools.
thanks
julie
-----Original Message-----
From: Lezz Giles [mailto:lgiles@avici.com
Sent: Friday, September 08, 2000 5:24 AM
To: Julie Leong
Cc: Clearcase (E-mail)
Subject: Re: [cciug] merging tools
Which version of Clearcase are you using? The interactive portion of merge
is much nicer and much easier to use in 4.0, but I think the underlying
algorithm is basically unchanged between 3.2 and 4.0.
Lezz
Julie Leong wrote:
> Hi,
>
> Anyone here know a better merging tools product that does much a better
job
> than ClearCase? Our company running into problem with ClearCase merge. I
> thought maybe someone here know a better product.
>
> thanks,
> Julie Leong
> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
>
-- Leslie Giles Software Release Manager Avici Systems Inc lgiles@avici.com Phone: 978.964.2030 Fax: 978.964.2100"Do not fear the merge"
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
This communication is for informational purposes only. It is not intended as an offer or solicitation for the purchase or sale of any financial instrument or as an official confirmation of any transaction. All market prices, data and other information are not warranted as to completeness or accuracy and are subject to change without notice. Any comments or statements made herein do not necessarily reflect those of J.P. Morgan & Co. Incorporated, its subsidiaries and affiliates.
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
This archive was generated by hypermail 2b29 : Sun May 06 2001 - 00:26:28 EDT