SVN Work Cycle
- Update your working copy.
- Make changes.
- edit code
- svn add
- svn delete
- svn copy
- svn move
- svn mkdir
- Examine your changes.
- svn status
- ? :file is not under version contrUL
- A :file is scheduled for addition
- C :file has textual conflicts from an update
- D :file is scheduled for deletion
- M :the content in bar.c has local modifications
- svn diff
- Possibly undo some changes.
- Resolve conflicts (merge others' changes).
- svn update
- svn resolve
examples
- resolve --accept working RT.c
- resolve --accept mine-full RT.c
- resolve --accept theris-full RT.c
- Commit your changes.
Note: set default editor using export=/usr/bin/vi to enable vi to be used for conflict resolution
and merge tool using export=/usr/bin/meld for merging