The states of files in your working directory
- unchanged and current (no changes to the file in the
repository since you got it)
- local changed and current (your local copy has changed, but
the repository copy is the same as when you got it)
- unchanged and out-of-date (the copy in the repository has
changed, but your copy has not, an
svn update command
will work to get you a new copy)
- locally changed and out-of-date (the file has changed in
both your local working copy and the repository, if you try to do
svn commit , you will get an "out-of-date" error, you
must update first and if subversion can't resolve the merge you
will have to help)
- You can use
svn status to see the state of any
item in your working directory.
previous |
start |
next .... [Slide 16] ....