Simon Large wrote:
> 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.
Blocking/unblocking revisions from being merged is something that will
be done very rarely, most users will never use it.
I don't think this justifies a separate 'merge method'. When I first saw
the screenshot of the CollabNet merge wizard I thought that having 6
different methods to choose from on the very first page is bad: it only
discourages users because they won't know what to chose from.
> 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?
'unblocking' is simply a reverse-merge of the blocking merge.
Stefan
--
___
oo // \\ "De Chelonian Mobile"
(_,\/ \_/ \ TortoiseSVN
\ \_/_\_/> The coolest Interface to (Sub)Version Control
/_/ \_\ http://tortoisesvn.net
Received on 2008-03-08 09:03:30 CET