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

Re: Bitesized 576

From: Garrett Rooney <rooneg_at_electricjellyfish.net>
Date: 2001-12-13 14:30:07 CET

On Thu, Dec 13, 2001 at 08:09:11AM +0100, Daniel Stenberg wrote:
> On Wed, 12 Dec 2001, Garrett Rooney wrote:
>
> > any chance on getting this committed? (or if not, getting some input on
> > what to change...)
> >
> > patch and log entry attached.
>
> Have you really verified that this patch does what it is supposed to and not
> any more? It doesn't work for me:
>
> $ svn commit -F Garrett.txt
>
> svn_error: #21093 : <The log message is under version control. Use --force
> to override.>
>
> On main.c:498 svn_wc_entry() returns 0, which equals SVN_NO_ERROR...
>
> Without doing any very deep research here, I *suspect* that the code in
> main.c must instead look similar to this:
>
> svn_wc_entry_t *ent=NULL;
> err = svn_wc_entry(&ent, svn_stringbuf_create(opt_arg, pool), pool);
> if ( (err == SVN_NO_ERROR) && ent)
> log_under_version_control = TRUE;
>
> But I'd appreciate some tests or comments before I commit this.

ack! i could have sworn i tested that case, but i must have been mistaken...
it was missing the && ent... with that added, i believe all cases
work fine... here are some of the permutations i've tried, starting
with an empty repository.

(foo and baz are files i add to the repository, and bar is a non
versioned file in the same dir that i'm using as a log entry)

rooneg_at_quicksilver:~/foo> svn co file:///home/rooneg/tmp
rooneg@quicksilver:~/foo> cd tmp/
rooneg@quicksilver:~/foo/tmp> touch foo
rooneg@quicksilver:~/foo/tmp> svn add foo
A foo
rooneg@quicksilver:~/foo/tmp>
/home/rooneg/svn/subversion/clients/cmdline/svn co mmit -F foo

svn_error: #21093 : <The log message is under version control. Use
--force to override.>
  
rooneg@quicksilver:~/foo/tmp> touch bar
rooneg@quicksilver:~/foo/tmp>
/home/rooneg/svn/subversion/clients/cmdline/svn co mmit -F bar
Adding /usr/home/rooneg/foo/tmp/foo
Commit succeeded.
rooneg@quicksilver:~/foo/tmp> touch baz
rooneg@quicksilver:~/foo/tmp> svn add baz
A baz
rooneg@quicksilver:~/foo/tmp>
/home/rooneg/svn/subversion/clients/cmdline/svn co mmit -F foo baz

svn_error: #21093 : <The log message is under version control. Use
--force to override.>
  
rooneg@quicksilver:~/foo/tmp>
/home/rooneg/svn/subversion/clients/cmdline/svn co
mmit -F bar baz
Adding /usr/home/rooneg/foo/tmp/baz
Commit succeeded.
rooneg@quicksilver:~/foo/tmp>

-- 
garrett rooney                     Unix was not designed to stop you from 
rooneg@electricjellyfish.net       doing stupid things, because that would  
http://electricjellyfish.net/      stop you from doing clever things.



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org

  • text/plain attachment: log
Received on Sat Oct 21 14:36:52 2006

This is an archived mail posted to the Subversion Dev mailing list.