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

Bernhard Merkle wrote:
>>> - 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...
>
> Hm, my idea was to _optionally_ offer this functionality. I should not
> be required.
> But if somebody or a team decides to _adhere_ to a convention (e.g. a
> fixed log msg in that case) we could _help_ them if you offer such a
> optional functionality. Of course it should be customizable. (I think
> you already have such things, e.g. i can select if I always want to
> have the OK dialog at the end of a operation or only in certain
> situations...)
>
>
>>> - 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?
>
> right, --recordy-only and merge does not do a commit of course.
> however we could output a text at the end of such a operation (similar
> to the case i described).
> Maybe a text that follows the tips of:
> http://svnbook.red-bean.com/nightly/en/svn.branchmerge.advanced.html#svn.branchmerge.advanced.blockchanges
> e.g. (just my idea):
> "with --record-only you blocked the changeset %d.
> It is recommended to commit this blocked changeset immediately as
> single commit.
> Please use the following $log during commit.
> Block r3328 from being merged to the branch. (or better)
> Blocked changeset %d from being merged from %urlFrom to %urlTo."

I don't think we should mention a specific log message to use in our
docs. That's for every project to decide. If you need a specific log
message for your projects, you should write a recommendation for all
your devs yourself.

> how about that or something similar.

We could mention that the log message should contain certain words to
make it easier for searching.

> I am uncertain but I think there is no metadata in svn where you can
> distinguish between such a blocked changeset and a "normal" merge,
> right ?. So the user should really follow this rule and I would be
> happy if you offer this.

There might be some metadata, but there's no API to get that
information. And without an API, we won't use that data - it could
change without notice since that's internal data.

Stefan

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