bug-rcs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

how to debug a possible problem with (rcs)merge


From: Raghuram Devarakonda
Subject: how to debug a possible problem with (rcs)merge
Date: Wed, 22 Nov 2006 10:59:00 -0500
User-agent: Thunderbird 1.5.0.7 (X11/20060909)

Hi,

In one particular case, rcsmerge does not report a conflict when it probably should. I am not sure if I can send out the actual files in bug report but I am investigating if there is anyway I can recreate the bug with some other dummy files. In the meanwhile, are there any special debugging procedures you suggest to use in analyzing the issue?

A brief description of the problem is as follows:

###############
$ diff file.1.54 file.1.55
<some other hunks>
....
1850a1857,1859
>             finally {
>                         ss.destroyNDMPSession();
>                 }
1851a1861
>

$ diff file.1.54 file

1850a1851
>           finally { //I3429XXX
##################

Since the added line at "1850" is conflicting, I thought that the following merge would report conflicts.

$ merge file.1.55 file.1.54 file

but it doesn't. Instead, it adds the line "finally { //I3429XXX" after the finally clause in 1.55 so that the end result looks like:

#############
             finally {
                         ss.destroyNDMPSession();
                 }
                finally { //I3429XXX

################

Am I missing something here? I am sorry if the report is sketchy but any help is appreciated. BTW, I also tried to use rcsmerge which gave the same result.

Thanks,
Raghu.
_____________________________________________________________________________

ATTENTION:

The information contained in this message (including any files transmitted with 
this message) may contain proprietary, trade secret or other  confidential 
and/or legally privileged information. Any pricing information contained in 
this message or in any files transmitted with this message is always 
confidential and cannot be shared with any third parties without prior written 
approval from Syncsort. This message is intended to be read only by the 
individual or entity to whom it is addressed or by their designee. If the 
reader of this message is not the intended recipient, you are on notice that 
any use, disclosure, copying or distribution of this message, in any form, is 
strictly prohibited. If you have received this message in error, please 
immediately notify the sender and/or Syncsort and destroy all copies of this 
message in your possession, custody or control.




reply via email to

[Prev in Thread] Current Thread [Next in Thread]