Bug 125742 - Export diff patch uses repository path
Export diff patch uses repository path
Status: NEW
Product: utilities
Classification: Unclassified
Component: Diff
6.x
All All
: P3 (vote)
: 6.x
Assigned To: Tomas Stupka
diff-issues@utilities
:
Depends on:
Blocks:
  Show dependency treegraph
 
Reported: 2008-01-22 13:37 UTC by novakm
Modified: 2010-10-07 15:17 UTC (History)
0 users

See Also:
Issue Type: ENHANCEMENT
:


Attachments

Note You need to log in before you can comment on or make changes to this bug.
Description novakm 2008-01-22 13:37:39 UTC
1) Create a new Java Application and import it into cvs repository into /trunk
2) Add a new file, select project root and export diff patch - the patch takes repository path of the project...

Index: trunk/JavaDiffApplication/src/javadiffapplication/NewClass.java
--- trunk/JavaDiffApplication/src/javadiffapplication/NewClass.java No Base Revision
+++ trunk/JavaDiffApplication/src/javadiffapplication/NewClass.java Locally New

If you apply the patch (with seleceted project root again), it will create trunk/JavaDiff.... on the same level as
folders src which is wrong. I know it is not the best scenario as anyone who will check out the project will have
correct path, but it could at least display warning dialog or somehow inform the user...

Product Version: NetBeans IDE Dev (Build 200801220000)
Java: 1.6.0_03; Java HotSpot(TM) Client VM 1.6.0_03-b05
Comment 1 Maros Sandor 2008-02-18 10:52:44 UTC
Usage of repository path is intentional, see Issue #72938 and Issue #112582. This is what other patch programs assume.
The primary place to apply a patch is the user-selected context. Since this is a wrong place actually at many cases I
have implemented some heuristics when looking for the correct place to apply the patch. You patch file, however, does
not contain enough information to correctly determine the right place because a new file can be placed anywhere. I would
consider this an RFE to:

- in case of new files try to match path in the Index entry to a file system path and if it finds a similar structure
(JavaDiffApplication/src/javadiffapplication), apply the patch there


By use of this website, you agree to the NetBeans Policies and Terms of Use. © 2012, Oracle Corporation and/or its affiliates. Sponsored by Oracle logo