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 169288 - add support for external and vcs diff/patch functionality
Summary: add support for external and vcs diff/patch functionality
Status: NEW
Alias: None
Product: utilities
Classification: Unclassified
Component: Diff (show other bugs)
Version: 6.x
Hardware: All All
: P3 blocker (vote)
Assignee: Ondrej Vrabec
Depends on:
Reported: 2009-07-28 09:18 UTC by Tomas Stupka
Modified: 2014-06-05 12:15 UTC (History)
1 user (show)

See Also:
Exception Reporter:


Note You need to log in before you can comment on or make changes to this bug.
Description Tomas Stupka 2009-07-28 09:18:41 UTC
the netbeans patch facility should delegate to the actual VCS if it has such functionality, e.g. 'hg imp --no-commit',
otherwise to /usr/bin/patch if that exists, and only to a built-in impl as a last resort.

see also 168246
Comment 1 Jesse Glick 2009-07-28 13:55:15 UTC
Perhaps it's a separate issue, but analogously the VCS' diff command should be preferred to the built-in one. For
example, 'hg di --git' is much better for exporting a diff from a Hg repository than the crude format the IDE generates.
Comment 2 Tomas Stupka 2009-07-28 14:14:23 UTC
lets handle it together in one issue...
Comment 3 Ondrej Vrabec 2010-02-26 07:24:51 UTC
one problem to discuss: in the diff generated by IDE there are also locally new files (not yet added) but 'hg diff' doesn't consider these files and skips them, right? Do we dare to skip them, too?
Comment 4 Jesse Glick 2010-02-26 10:05:49 UTC
(In reply to comment #3)
> there are also locally new files (not yet added)

So 'hg add' them.

(I wish you would anyway; it is a real pain to have to remember to run 'hg addrem' after using the IDE to create new files and then running external hg commands such as 'hg qnew -f'. 'hg rm' is already correctly run when files are deleted from the IDE, and 'hg ren' when they are moved.)