Re: Blocking Changed / record only in TTSVN, needs better support

Bernhard Merkle wrote:
> Hi again,
>
> Reading about Blocking Changes in the SVN user guide on page 103 i
> think the current implementation in svn s a really risky hack (sorry
> to be so explicit).
> The problem is that after it happended, i can not say if the merge did
> happen, or if it was a blocked changed. That information is lost and
> not recorded in the svn:mergeinfo property.
>
> So what to do ? IMO you essential rely on a descriptive log info and a
> single commit to record the blocked change and that it was your
> intention to do this.
>
>
> I would propose the following changes/helpers for TTSVN:
>
> - rename the checkbox "--record-only" to "block this merge" or at
> least add this as a description and highlight the word "block"

I've improved the tooltip for the checkbox in r14521.

> - if I choose to block a change with --record only" then TTSVN should
> add some fixed text like
> "blocked change #r %d" as a fixed comment into the log. So later i can
> search after this text pattern.

Merging does not commit the changes. And adding such a comment
automatically the next time the commit dialog is shown is bad because
the user might want to commit something else first, or they don't use
English for that project, or...

> - if I choose to block a change with --record only" then TTSVN should
> come up with a dialog which recommends to commit this change
> immediately and as sole commit. This would really help not to commit
> blocked changes with conducted changes. Also there is already such a
> hint dialog, e.g. when I so a label, you come up with a very usefull
> information dialog about switching or not.
> We really need something like this for this strange --record-only
> option.

What do you suggest the info text after such a merge should read?

> - IMO the term --record--only is too similar to --dry-run and can be
> confused very easy.

Added some more text to the checkbox in r14522.

Stefan

-- 
       ___
  oo  // \\      "De Chelonian Mobile"
 (_,\/ \_/ \     TortoiseSVN
   \ \_/_\_/>    The coolest Interface to (Sub)Version Control
   /_/   \_\     http://tortoisesvn.net