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

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

From: Bernhard Merkle <bernhard.merkle_at_googlemail.com>
Date: Wed, 5 Nov 2008 10:49:59 -0800 (PST)

> > - 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."

how about that or something similar.

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.

BTW. Thanks for the great work you do with TSVN. This is really
fantastic. :-)

> > - 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.

thanks again,

Bernhard.

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe_at_tortoisesvn.tigris.org
For additional commands, e-mail: users-help_at_tortoisesvn.tigris.org
Received on 2008-11-05 19:50:40 CET

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

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