[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: Fwd: Re: [TSVN] TortoiseMerge: Feature Request

From: Stefan Küng <tortoisesvn_at_gmail.com>
Date: 2005-09-20 18:10:47 CEST

Fernando P. Nájera Cano wrote:

> Option 1.
> Let's have some options/buttons/whatever for the file in each panel:
> "open in notepad". When selected/clicked, TMerge makes a temp copy of
> the file, including even changes that user may have done in the
> unsaved file, and launchs notepad with that file. When user saves the
> file in the notepad, TMerge knows it and msgboxs "File ... has changed
> in external editor... do you want to reload?" If yes, TMerge updates
> its copy of the file from the temp file and re-calculate everything.
> If no, TMerge broke the logical link with notepad (I mean, further
> changes to notepad won't ever be reflected in TMerge until notepad is
> closed and re-launched).

That might work in two pane view, but not in merge (three pane) view. In
that view, the resulting file doesn't really exist until you save your
changes. And even then, you would edit the *resulting* file, not the
original conflicting files. So once you've edited the file, TMerge
wouldn't know about it, or if we would detect changes, we can't really
use them because in that view, three other files are used to create the
view in the bottom pane, not the resulting file.

> Option 2.
> The same, but saving file before launching in external editor. This
> way, you won't need to make a temp copy and launch that temp copy
> (maybe easier to program?).
> Also, with this approach, you can open the file in MyFavouriteEditor
> from the Explorer and change it, and TMerge can be aware of this and
> make me the question. So, the TMerge option to launch it in external
> editor would be not necessary but convenient.

Same here as above.


   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest Interface to (Sub)Version Control
    /_/   \_\     http://tortoisesvn.tigris.org
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Tue Sep 20 20:26:36 2005

This is an archived mail posted to the TortoiseSVN Dev mailing list.