You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@subversion.apache.org by Sander Striker <st...@apache.org> on 2002/06/25 12:01:33 UTC
RE: svn commit: rev 2330 - trunk trunk/subversion trunk/subversion/include trunk/subversion/libsvn_auth
> From: gstein@tigris.org [mailto:gstein@tigris.org]
> Sent: 25 June 2002 13:05
> Author: gstein
> Date: Tue, 25 Jun 2002 06:05:14 -0500
> New Revision: 2330
>
> Added:
> trunk/subversion/include/svn_auth.h
> trunk/subversion/libsvn_auth/
> trunk/subversion/libsvn_auth/auth.c
> Modified:
> trunk/build.conf
> Log:
[...]
> SVN: ---------------------------------------------------------------------
> SVN: Enter Log. Lines beginning with 'SVN:' are removed automatically
> SVN:
> SVN: Current status of the target files and directories:
> SVN:
> SVN: M /home/gstein/src/svn/build.conf
> SVN: A /home/gstein/src/svn/subversion/include/svn_auth.h
> SVN: AM /home/gstein/src/svn/subversion/libsvn_auth
> SVN: A /home/gstein/src/svn/subversion/libsvn_auth/auth.c
Hmmm... :)
Sander
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: svn commit: rev 2330 - trunk trunk/subversion trunk/subversion/include trunk/subversion/libsvn_auth
Posted by Karl Fogel <kf...@newton.ch.collab.net>.
Greg Stein <gs...@lyra.org> writes:
> When we leave the file behind after an aborted commit (a conflict problem in
> my case), then we should process the SVN: markers out of it. I'll go and
> annotate the issue about leaving msg files.
Bing! Great solution.
> No way should we strip them from provided files. That could damage whatever
> a user may put in there. It is the EDITOR behavior where we defined SVN:
> stripping.
Agreed.
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: svn commit: rev 2330 - trunk trunk/subversion trunk/subversion/include trunk/subversion/libsvn_auth
Posted by Greg Stein <gs...@lyra.org>.
On Tue, Jun 25, 2002 at 11:07:36AM -0500, Karl Fogel wrote:
> "Sander Striker" <st...@apache.org> writes:
> > > SVN: ---------------------------------------------------------------------
> > > SVN: Enter Log. Lines beginning with 'SVN:' are removed automatically
> > > SVN:
> > > SVN: Current status of the target files and directories:
> > > SVN:
> > > SVN: M /home/gstein/src/svn/build.conf
> > > SVN: A /home/gstein/src/svn/subversion/include/svn_auth.h
> > > SVN: AM /home/gstein/src/svn/subversion/libsvn_auth
> > > SVN: A /home/gstein/src/svn/subversion/libsvn_auth/auth.c
> >
> > Hmmm... :)
Hehe...
> Greg, I'm gonna make a guess:
>
> Did you write your log message by having an editor pop up, but then
> for some reason aborted the commit, leaving the log message saved in a
> file... and then redo the commit later with -F?
Bing! Got it in one. :-)
> Looking at the control flow in svn_cl__get_log_message(), the above
> result is exactly what would happen. We only attempt to strip the
> prefix if the message was obtained from $EDITOR. If we already have
> the message (for example, via -F) then we just return it directly,
> with no further processing.
>
> I'm not sure that anything should necessarily be done about this...
> though an argument can be made for always stripping the prefix, no
> matter what the source of the message. Hmmm.
>
> Thoughts?
When we leave the file behind after an aborted commit (a conflict problem in
my case), then we should process the SVN: markers out of it. I'll go and
annotate the issue about leaving msg files.
No way should we strip them from provided files. That could damage whatever
a user may put in there. It is the EDITOR behavior where we defined SVN:
stripping.
Cheers,
-Greg "off to tweak the log msg" Stein
--
Greg Stein, http://www.lyra.org/
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: svn commit: rev 2330 - trunk trunk/subversion trunk/subversion/include trunk/subversion/libsvn_auth
Posted by Karl Fogel <kf...@newton.ch.collab.net>.
"Sander Striker" <st...@apache.org> writes:
> > SVN: ---------------------------------------------------------------------
> > SVN: Enter Log. Lines beginning with 'SVN:' are removed automatically
> > SVN:
> > SVN: Current status of the target files and directories:
> > SVN:
> > SVN: M /home/gstein/src/svn/build.conf
> > SVN: A /home/gstein/src/svn/subversion/include/svn_auth.h
> > SVN: AM /home/gstein/src/svn/subversion/libsvn_auth
> > SVN: A /home/gstein/src/svn/subversion/libsvn_auth/auth.c
>
> Hmmm... :)
Greg, I'm gonna make a guess:
Did you write your log message by having an editor pop up, but then
for some reason aborted the commit, leaving the log message saved in a
file... and then redo the commit later with -F?
Looking at the control flow in svn_cl__get_log_message(), the above
result is exactly what would happen. We only attempt to strip the
prefix if the message was obtained from $EDITOR. If we already have
the message (for example, via -F) then we just return it directly,
with no further processing.
I'm not sure that anything should necessarily be done about this...
though an argument can be made for always stripping the prefix, no
matter what the source of the message. Hmmm.
Thoughts?
-Karl
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org