This Bugzilla instance is a read-only archive of historic NetBeans bug reports. To report a bug in NetBeans please follow the project's instructions for reporting issues.

Bug 20831

Summary:	Update sometimes break the Patched files (with label P).
Product:	versioncontrol	Reporter:	Milos Kleint <mkleint>
Component:	CVS	Assignee:	issues@versioncontrol <issues>
Status:	CLOSED FIXED
Severity:	blocker
Priority:	P1
Version:	3.x
Hardware:	PC
OS:	All
Issue Type:	DEFECT	Exception Reporter:

Description Milos Kleint 2002-02-25 12:31:42 UTC

Dev build 25/Feb/2002.

Some patched files that were updated got broken and the update didn't merge the
local copy with the patch sent from server. The corrupts the file. Workaround is
to create cvs update -C, however if the user has locally modified the file, then
the local changes will be discarded.

Comment 1 Milos Kleint 2002-02-25 13:34:43 UTC

fixed in main trunk. (the bug appears in trunk only as well..)

Comment 2 Jiri Kovalsky 2002-03-15 11:33:13 UTC

I think it behaves all right now. I have tried maybe ten patched
update attempts and all updated my source file correctly so that diff
didn't discover any differences. Verified in development build
#200203150100 of NetBeans 3.4.

Comment 3 Quality Engineering 2003-07-01 12:49:26 UTC

Resolved for 3.4.x or earlier, no new info since then -> closing.