1.2.5. Viewing Changes
Viewing the Status
To determine the current status of a working copy, change to the directory with the working copy and run the following command:
svn
status
This displays information about all changes to the working copy (
A
for a file that is scheduled for addition, D
for a file that is scheduled for removal, M
for a file that contains local changes, C
for a file with unresolved conflicts, ?
for a file that is not under revision control).
Example 1.10. Viewing the status of a working copy
Imagine that the directory with your working copy of a Subversion repository has the following contents:
project]$ ls
AUTHORS ChangeLog COPYING doc INSTALL Makefile README src
With the exception of
ChangeLog
, which is scheduled for addition to the Subversion repository, all files and directories within this directory are already under revision control. The TODO
file, which is also under revision control, has been scheduled for removal and is no longer present in the working copy. The LICENSE
file has been renamed to COPYING
, and Makefile
contains local changes. To display the status of such a working copy, type:
project]$ svn status
D LICENSE
D TODO
A ChangeLog
A + COPYING
M Makefile
Viewing Differences
To view differences between a working copy and the checked out content, change to the directory with the working copy and run the following command:
svn
diff
[file…]
This displays changes to all files in the working copy. If you are only interested in changes to a particular file, supply the file name on the command line.
Example 1.11. Viewing changes to a working copy
Imagine that the directory with your working copy of a Subversion repository has the following contents:
project]$ ls
AUTHORS ChangeLog COPYING CVS doc INSTALL Makefile README src
All files in this directory are under revision control and
Makefile
contains local changes. To view these changes, type:
project]$ svn diff Makefile
Index: Makefile
===================================================================
--- Makefile (revision 1)
+++ Makefile (working copy)
@@ -153,7 +153,7 @@
-rmdir $(man1dir)
clean:
- -rm -f $(MAN1)
+ -rm -f $(MAN1) $(MAN7)
%.1: %.pl
$(POD2MAN) --section=1 --release="Version $(VERSION)" \