#76 Merging or patching changes to files

open
nobody
None
5
2004-10-06
2004-10-06
No

It would be nice if, when a file changes out from under
NEdit, you had the option to merge in the differences,
like an interactive patch merge. Kind of like how
eclipse does its team sync stuff, if you've ever seen that.

You could do a side-by-side diff of some type, and show
each chunk separately, giving the option to accept or
reject each one, or to accept or reject all; then each
chunk could be one entry in the undo history, like a paste.

Coolest of all would be a 3-way diff, for if you've got
unsaved changes to a file, and the original working
file got updated externally. You could merge the diff
of original->new file into the working file.

Anyway, that beats either (a) throwing away all your
unsaved changes or at the very least (b) losing your
undo history, both of which kinda suck.

Discussion

  • Joerg Fischer

    Joerg Fischer - 2004-10-07

    Logged In: YES
    user_id=918104

    Please notice that nedit is a text editor.
    (From nedit.org :
    About NEdit
    NEdit is a multi-purpose text editor for the X Window
    System,...)

    So, it is neither an IDE nor a diff tool. There are however
    some macros available for diff-/ merging. See
    http://www.nr.no/~joachim/Niki/index.php/Macro%20Collection

     
  • David M. Lloyd

    David M. Lloyd - 2004-10-08

    Logged In: YES
    user_id=115186

    Fair enough. What about providing a hook then so that a
    macro can be run when the file changes, allowing it to
    override the "file has changed" dialog? Or is there another
    way to do this that I don't know of?

     
  • Joerg Fischer

    Joerg Fischer - 2004-10-08

    Logged In: YES
    user_id=918104

    Unfortunately, hooks for the macro language are still missing.
    They are wished for since long time. But as usual someone has
    to do it. So far there was only an experimental patch (#815454),
    and lately almost all energy went to the tabbed interface, which
    was a major change.

     

Get latest updates about Open Source Projects, Conferences and News.

Sign up for the SourceForge newsletter:





No, thanks