|
From: | Heirler Stefan |
Subject: | incorrect merge result |
Date: | Tue, 12 Feb 2002 09:53:47 +0100 |
Program: CVS Server-Verison: cvs --version Concurrent Versions System (CVS) 1.11 (client/server) Copyright (c) 1989-2000 Brian Berliner, david d `zoo' zuhn, Jeff Polk, and other authors CVS may be copied only under the terms of the GNU General Public License, a copy of which can be found with the CVS distribution kit. Specify the --help option for further information about CVS Server-OS: uname -a SunOS sux000 5.5.1 Generic_103640-38 sun4u sparc SUNW,Ultra-250 Client-Version: cvs --version Concurrent Versions System (CVS) 1.11 (client/server) Copyright (c) 1989-2000 Brian Berliner, david d `zoo' zuhn, Jeff Polk, and other authors CVS may be copied only under the terms of the GNU General Public License, a copy of which can be found with the CVS distribution kit. Specify the --help option for further information about CVS n Client-OS: uname -a Linux kstbwu08 2.2.18-SMP #1 SMP Sat Jan 20 07:41:17 GMT 2001 i686 unknown Description: The "auto-merger" invoked from "cvs update" produces incorrect merge results, at least in the case of conflicts. The resulting file containing the conflict markers contains lines of text outside of the conflict markers which are not present in all versions of the file! > cvs co -r 1.19 scs/sti/ipif_obj.c > modify scs/sti/ipif_obj.c > cvs update -A -r 1.22 scs/sti/ipif_obj.c Lines 967 and 968 *LineNumber = charobj->in_line; *maxLineNumber = charobj->in_line; /* not support for this implementation */ at the beginning of function (void) ignoreReject; in the merged file are not present in both versions of the file and should therefore be part of the conflict and not outside of the conflicting region of text. Attachment: Version 1.19 of ipif_obj.c <<1_19_ipif_obj.c>> Version 1.22 of ipif_obj.c <<1_22_ipif_obj.c>> Modified version of ipif_obj.c <<modified_ipif_obj.c>> Merge result of ipif_obj.c <<merged_ipif_obj.c>> Is this really a bug or do we something wrong? Stefan
1_19_ipif_obj.c
Description: Binary data
1_22_ipif_obj.c
Description: Binary data
modified_ipif_obj.c
Description: Binary data
merged_ipif_obj.c
Description: Binary data
[Prev in Thread] | Current Thread | [Next in Thread] |