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

[TSVN] Feature request; merging

From: Peter Mounce <petermounce_at_iml.co.uk>
Date: 2005-06-03 12:26:55 CEST

Hi all

When performing a merge between two branches, I often forget the
revision numbers of the merge. Even if there are no conflicts to
resolve, or problems at all - I still find myself going back to the
merge dialog and setting it up again, just to get the revision numbers.

Is there some way TSVN can be made to help out, here? For example,
record the fact that a merge has just happened, and remember that the
next time the commit dialog is opened, with a hint to the user that the
last merge operation was x:y from:to?

Or perhaps at the end of the merge dialog (the one that gets spawned by
clicking merge or dry run, I mean, here), a bit of cut and past-able
text I can copy into a text editor, for later when I come to commit?
The same thing you do for error messages, like when the WC needs a
clean-up.

I've no idea about the best way to accomplish this, and I guess there
are lots of other considerations and edge cases - for example, what
happens if the user changes some files not changed by the merge - should
that still be considered a merge? How does it cope with a merge, then
another merge without a commit inbetween?

But, yeah. A little aide to the memory is what I'm after.
 
Peter Mounce
IML Ltd
 
e: mailto:petermounce_at_iml.co.uk w: http://www.iml.co.uk
t: (01428) 727476 f: (01428) 727011

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Fri Jun 3 12:29:31 2005

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