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 68274 - Improvment for "Apply Diff Patch"
Summary: Improvment for "Apply Diff Patch"
Status: VERIFIED FIXED
Alias: None
Product: versioncontrol
Classification: Unclassified
Component: CVS (show other bugs)
Version: 5.x
Hardware: All Windows XP
: P3 blocker (vote)
Assignee: diff-issues@utilities
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2005-11-08 13:04 UTC by Peter Pis
Modified: 2007-01-04 17:14 UTC (History)
0 users

See Also:
Issue Type: DEFECT
Exception Reporter:


Attachments

Note You need to log in before you can comment on or make changes to this bug.
Description Peter Pis 2005-11-08 13:04:16 UTC
System Info:
 Product Version         = NetBeans IDE Dev (Build 200511071900)
 Operating System        = Windows XP version 5.1 running on x86
 Java; VM; Vendor; Home  = 1.5.0_05; Java HotSpot(TM) Client VM 1.5.0_05-b05;
Sun Microsystems Inc.; d:\Java\jdk1.5.0_05\jre

Steps:
1. Check out sources, open project.
2. Create new package "aa" in "src". Create a Java Class there. Commit it.
3. Create new package "bb" in "src". Create a Java Class there. Commit it.
4. Modify and save file in package "aa" and the same for package "bb".
5. Select project root and invoke "CVS | Export <project name> Diff Patch" main
menu action.
6. Now on project root invoke "CVS | Revert Modifications" action.
7. Switch to "Files" view and invoke "Tools | Apply Diff Patch" popup menu action.

Dialog is shown up with infomation that this patch can't be applied. It has to
be applied on "src" package. This can be confusing. There should be opportunity
of how to apply patch on the same context it has been invoked.
Comment 1 Maros Sandor 2005-11-08 13:20:45 UTC
Patch is now relative to the selected context whenever possible.

/shared/data/ccvs/repository/javacvs/cvsmodule/src/org/netbeans/modules/versioning/system/cvss/ui/actions/diff/ExportDiffAction.java,v
 <--  ExportDiffAction.java
new revision: 1.28; previous revision: 1.27
Comment 2 Peter Pis 2005-11-14 09:05:31 UTC
Verified. NetBeans IDE Dev (Build 200511131900)