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 121557 - "*.rej" should be ignored.
Summary: "*.rej" should be ignored.
Status: VERIFIED FIXED
Alias: None
Product: versioncontrol
Classification: Unclassified
Component: Mercurial (show other bugs)
Version: 6.x
Hardware: All All
: P3 blocker (vote)
Assignee: issues@versioncontrol
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2007-11-09 11:10 UTC by Peter Pis
Modified: 2008-01-03 09:32 UTC (History)
0 users

See Also:
Issue Type: DEFECT
Exception Reporter:


Attachments
proposed patch (820 bytes, patch)
2007-11-12 13:16 UTC, Padraig Obriain
Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Peter Pis 2007-11-09 11:10:34 UTC
Product Version: NetBeans IDE 6.0 RC1 (Build 200711090000)
Java: 1.6.0_03; Java HotSpot(TM) Client VM 1.6.0_03-b05
System: Windows XP version 5.1 running on x86; Cp1252; en_GB (nb)
Userdir: D:\ide\60daily\user

Importing patch caused some problems and created "*.rej" files. There are shown as [New] which is wrong.

Mercurial Import
----------------
ERROR Command failed:
Command: [hg, import, -v, --repository, D:\SunWork\test\mercurial\work\MyAppUnderHg_clone0, --cwd,
D:\SunWork\test\mercurial\work\MyAppUnderHg_clone0, D:\tmp\MyAppUnderHg_1_08ef0374b398]
Output: [applying D:\tmp\MyAppUnderHg_1_08ef0374b398, patching file src/myappunderhg/Main.java, patching file
src/myappunderhg/xx/yy/NewClass.java, Hunk #1 FAILED at 5, 1 out of 1 hunk FAILED -- saving rejects to file
src/myappunderhg/Main.java.rej, file src/myappunderhg/xx/yy/NewClass.java already exists, 1 out of 1 hunk FAILED --
saving rejects to file src/myappunderhg/xx/yy/NewClass.java.rej, abort: patch failed to apply]
INFO: End of Import
Comment 1 Padraig Obriain 2007-11-12 13:16:40 UTC
Created attachment 52878 [details]
proposed patch
Comment 2 Padraig Obriain 2007-11-13 11:41:23 UTC
IDE:-------------------------------------------------
IDE: [11/13/07 11:40 AM] Committing "HgUtils.java" started
Checking in HgUtils.java;
/shared/data/ccvs/repository/versioncontrol/mercurial/src/org/netbeans/modules/mercurial/util/HgUtils.java,v  <-- 
HgUtils.java
new revision: 1.20; previous revision: 1.19
done
IDE: [11/13/07 11:40 AM] Committing "HgUtils.java" finished
Comment 3 Peter Pis 2007-11-16 14:17:58 UTC
Verified.