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 33769 - PVCS: Useless deletion of file if merging to another file.
Summary: PVCS: Useless deletion of file if merging to another file.
Status: VERIFIED FIXED
Alias: None
Product: obsolete
Classification: Unclassified
Component: vcsgeneric (show other bugs)
Version: -S1S-
Hardware: Sun Solaris
: P4 blocker (vote)
Assignee: Martin Entlicher
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2003-05-20 13:28 UTC by Jiri Kovalsky
Modified: 2006-03-24 07:42 UTC (History)
0 users

See Also:
Issue Type: DEFECT
Exception Reporter:

Attachments
Add an attachment (proposed patch, testcase, etc.)

Note You need to log in before you can comment on or make changes to this bug.
Description Jiri Kovalsky 2003-05-20 13:28:30 UTC 
Sun ONE Studio 5.0, RC build #030516
Solaris 5.8 with JDK 1.4.1 build #02

Description:
============
It is not clever to always delete the file that is
being merged by PVCS. If user chooses possibility
to save the result into separate file, s/he must
then get the file back from *.orig backup file.
Please make the deletion conditioned.

Steps to reproduce:
===================
1. Mount PVCS filesystem and right click some
file.
2. Hold down CTRL key and select "PVCS|Merge...".
3. Select some "Output File" and push "OK".
4. Verify that the file was deleted.
Comment 1 Martin Entlicher 2003-05-20 13:37:03 UTC 
I agree. There should be introduced a condition to handle that.
Comment 2 Martin Entlicher 2004-04-26 15:00:59 UTC 
Scheduling for promotion D.
Comment 3 Martin Entlicher 2004-10-15 17:01:01 UTC 
This was just fixed (in issue #48537, which should have been a
duplicate of this).
Comment 4 Jiri Kovalsky 2006-03-24 07:42:35 UTC 
Verified in FCS build #200505031930 of NetBeans 4.1.