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

Re: What revision should an added not yet commited node have?

From: Daniel Näslund <daniel_at_longitudo.com>
Date: Fri, 19 Mar 2010 07:37:21 +0100

On Fri, Mar 19, 2010 at 02:33:33AM +0100, Neels J Hofmeyr wrote:
> C. Michael Pilato wrote:
> > Stefan Sperling wrote:
> >> On Tue, Mar 16, 2010 at 09:01:28PM +0100, Daniel Näslund wrote:
> >>> Hi!
> >>>
> >>> When trying to replace entries in the status code I got a couple of test
> >>> failures saying that the revision should be 0 for newly added nodes.
> >>> Greg pointed out that the entries code set the revision to 0 for those
> >>> cases while the revision returned from _read_info() sets it to -1.
> >>>
> >>> Should we continue to use the 0 value? Is it well established as the
> >>> revision number of version controlled, not yet committed files or should
> >>> we tell 'svn info' and 'svn status' to not output any rev nr at all for
> >>> these nodes?
> >> I think -1 (invalid revnum) is more appropriate than 0.
>
> Nice, I hit that same question like two weeks ago, with
> svn_client__get_revision_number() upon svn_opt_revision_base for added
> nodes. I found the same conclusion: it should have always returned -1.
>
> I am at the point where I would trial to see how callers deal with a -1
> revision number ("would" because I need to study for an exam next week, bah).
>
> Ideally, we will change the behaviour of this private function when
> switching it to wc-ng. I hope we don't have to mock up current behaviour for
> compat, especially because that depends on parent nodes sometimes.

I've decided to postpone the change of revisions set to zero to a
follow-up. Two reasons: (i) I'm _replacing_ revisions fetched from the
entries file with revisions fetched from the db, changing the behaviour
is a separate task that involves fiddling with a lot of test, causing me
to loose momentum with the svn_wc_status2_t work. (ii) The info code
uses zeroes too for newly added nodes. It would be better to change the
behavior of 'svn {info,status}' at the same time.

When it's time to replace the zeroes in the CLI, I opt for leaving those
fields blank. We have no revision, we show no revision. Plain and
simple!

Btw, other diffs I've found between entries and db handling of
revisions: (i) A missing dir has no revision value in the entries code,
but it has in the db. (ii) A file copied from foreign url to a wc has
the revision number set to its value in the foreign repo, although it is
locally added w/o history in this wc and thus should have 0. That's for
the entries. The db sets it to -1.

I have some quirks with switching locally added files but that's for
another post.

Daniel
Received on 2010-03-19 07:38:02 CET

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