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

Merge options

From: Simon Large <simon.tortoisesvn_at_googlemail.com>
Date: Fri, 7 Mar 2008 23:17:55 +0000

Hi folks,

There is a nice picture of CollabNet's merge client here:
http://merge-tracking.open.collab.net/servlets/ProjectProcess?pageID=3709&freeformpage=Merge%20Client%20Overview

They present the 'block revisions from being merged' and 'unblock
revisions ...' on the front page and I was wondering if there is
anything to gain by doing something similar. We have that feature but
it is on the last page under 'Only record the merge'. If I have
understood merge tracking at all I believe that option is only
relevant to the 'Merge a range' option on the front page, so it should
be disabled for the other cases. Also the line-ending and whitespace
options are irrelevant for record-only. It might make more sense to
users to implement this as a separate merge method.

I'm not quite sure how the unblock revisions works, though I assume it
is just deleting revisions from the mergeinfo property. Does the
subversion API support this? Do we need to add it?

Simon

-- 
       ___
  oo  // \\      "De Chelonian Mobile"
 (_,\/ \_/ \     TortoiseSVN
   \ \_/_\_/>    The coolest Interface to (Sub)Version Control
   /_/   \_\     http://tortoisesvn.net
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe_at_tortoisesvn.tigris.org
For additional commands, e-mail: dev-help_at_tortoisesvn.tigris.org
Received on 2008-03-08 00:18:08 CET

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.