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 225757 - Patch action cannot apply patches with renames
Summary: Patch action cannot apply patches with renames
Status: RESOLVED FIXED
Alias: None
Product: utilities
Classification: Unclassified
Component: Diff (show other bugs)
Version: 7.3
Hardware: PC Linux
: P3 normal (vote)
Assignee: Tomas Stupka
URL:
Keywords:
Depends on:
Blocks: 225057
  Show dependency tree
 
Reported: 2013-02-05 15:51 UTC by Ondrej Vrabec
Modified: 2013-02-06 11:20 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 Ondrej Vrabec 2013-02-05 15:51:17 UTC 
git or mercurial (--git) patches containing renames cannot be applied. Or to be more precise, the rename is not applied:
Comment 1 Ondrej Vrabec 2013-02-05 15:51:28 UTC 
diff --git a/src/pkg224947/NewClass.java b/src/pkg224947/NewClass2.java
rename from src/pkg224947/NewClass.java
rename to src/pkg224947/NewClass2.java
--- a/src/pkg224947/NewClass.java
+++ b/src/pkg224947/NewClass2.java
@@ -8,6 +8,6 @@
  *
  * @author ondra
  */
-public class NewClass {
+public class NewClass2 {
 
 }
Comment 2 Ondrej Vrabec 2013-02-05 17:01:16 UTC 
fix: http://hg.netbeans.org/core-main/rev/8e248a0f28db
Comment 3 Quality Engineering 2013-02-06 11:20:26 UTC 
Integrated into 'main-golden', will be available in build *201302060843* on http://bits.netbeans.org/dev/nightly/ (upload may still be in progress)
Changeset: http://hg.netbeans.org/main-golden/rev/8e248a0f28db
User: Ondrej Vrabec <ovrabec@netbeans.org>
Log: #225757 - Patch action cannot apply patches with renames
tuning the patch algorithm to be able to apply git or mercurial renames