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

Re: Subversion revision numbers

From: Ryan Schmidt <subversion-2006Q1_at_ryandesign.com>
Date: 2006-04-26 12:12:00 CEST

On Apr 26, 2006, at 09:59, Bart van Kuik wrote:

> $ svn commit -m "blah"
> <snip>
> $ svnversion .
> 387:388
> $ svn status
> ? Config.h.r350
> ? Config.h.mine
> ? Config.h.r363
> $ rm Config.h.* # I remove the offending files
> $ svn status
> $ svnversion .
> 387:388
> $ svn update
> At revision 388.
> $ svnversion .
> 388
>
> My questions:
> - When I do an svnversion for the second time, it returns a range,
> 387:388. What does this mean? That I'm "between" revisions 387 and
> 388? Can somebody give a more precise definition?

It means that of all the items in your working copy, the one with the
lowest revision is from revision 387, and the highest is from r388.

> - Why did I have to do an update before "svnversion" would give me
> "388"? After "svn status", my working copy should already be at
> "388", rigth?

Before the update, you had a mixed-revision working copy.

http://svnbook.red-bean.com/en/1.1/ch02s03.html#svn-ch-2-sect-3.4

By the way, you usually don't need to do things like "rm Config.h.*";
usually you'd resolve the conflict by whatever means, and then inform
Subversion that you did this with "svn resolved Config.h" and it'll
delete the other files for you.

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Wed Apr 26 12:13:21 2006

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

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