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

Re: [TSVN] Feature request; merging

From: Simon Large <slarge_at_slarge.plus.com>
Date: 2005-06-03 12:38:29 CEST

Peter Mounce wrote:
> 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?

Proper merge tracking is on the SVN to-do list, so we don't really want
to put in a stopgap solution. The advice given in the manual is to
annotate your commit log message with what you just merged.

Simon

-- 
       ___
  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 Fri Jun 3 12:37:51 2005

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