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

Re: book description of mixed revision working copy looks weird

From: Robert P. J. Day <rpjday_at_crashcourse.ca>
Date: Sat, 13 Sep 2008 17:22:49 -0400

Quoting Ryan Schmidt <subversion-2008c_at_ryandesign.com>:

>
> On Sep 13, 2008, at 3:51 PM, Robert P. J. Day wrote:
>
>> from here,
>> http://svnbook.red-bean.com/nightly/en/svn.basic.in-action.html,
>> the list of the four states a file can be in, there's this:
>>
>> "Unchanged, and out of date
>>
>> "The file has not been changed in the working directory, but it has
>> been changed in the repository. The file should eventually be
>> updated in order to make it current with the latest public
>> revision. An svn commit of the file will do nothing, and an svn
>> update of the file will fold the latest changes into your working
>> copy."
>>
>> i'm hoping i haven't misunderstood things all this time, but to
>> say something is "out of date" in the above context doesn't
>> necessarily mean that the file's contents have *changed*, only that
>> it's revision number in the repository is now larger than the one
>> in the working copy, no? but that doesn't mean that the file is
>> necessarily different, although that's the interpretation one might
>> take away from the above.
>
> No no, I think this part is describing a situation where the file in
> the working copy and the file in the repository do in fact differ. An
> "svn commit" will do nothing (because Subversion will display and error
> that your file is out of date and you must "svn update" first), and an
> "svn update" will download the necessary changes from the repository to
> bring your working copy up to date with the latest revision so that you
> can commit.
>
> In contrast, if the file in the working copy and the file in the
> repository are the same, but the repository merely has a higher
> revision than your working copy, then the file is not out of date; it
> is up to date. The would be the first described state, "Unchanged, and
> current".

ok, i'm good with that, thanks.

rday

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: users-help_at_subversion.tigris.org
Received on 2008-09-13 23:23:13 CEST

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.