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

Re: [TSVN] TortoiseMerge: Feature Request

From: Fernando P. Nájera Cano <tortoisesvn_at_fernandonajera.com>
Date: 2005-08-03 23:36:11 CEST

Hi,

At miércoles, 03 de agosto de 2005, 16:42:57, you wrote:

RLA> Feature Request: Edit mode in TortoiseMerge

Well... I know that this "feature" won't be included in TMerge. Stefan
has discussed about it before.

But I was wondering... maybe this could be a useful? workaround.

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).

This is quite the same behaviour you have from VS.NET IDE if you open
the same file from VS.NET IDE and other program (say notepad). If you
modify and save it in notepad, VS.NET IDE will know and will ask you
to update its contents.

It is indeed a little more complicated (if user has changed the file
in both notepad and TMerge, the question should be "File ... has
changed in the external editor and also here... what version would you
like to keep?") but the whole idea can be useful.

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.

---
I don't know if this text is clear, I can rephrase it if it isn't.
Edit a file with both VS.NET IDE and notepad, change and save in one
program and see the way the other reacts. Notepad is not change-aware,
VS.NET IDE is. If you use Ultraedit instead notepad, both are
change-aware and I find it quite useful (there're changes easier to do
in one editor and others easier in the other one).
It is not exactly "editing in TMerge" but it adds quite more
flexibility. The point is launching external editor from TMerge in an
easy way, updating TMerge with changes from file **AND** recalculate
diffs.
Just an idea.
Best regards,
Fernando Nájera
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Wed Aug 3 23:37:41 2005

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