Subversion (Svn) Cheat Sheet (Page 2 of 2) in pdf

*1) Update Status Descriptions

6 possible status can occur after you do a "update", per file:

unchanged

If C happens 3 copies of the file will be created:

added

and file.c.rNEW.

will have conflict markers added. You

file.c.mine,

file.c.rOLD

file.c

deleted

will only be able to commit again when those 3 files have been removed. This can be

replaced

done automatically by running svn

file.c, which removes those 3 files.

resolved

merged

conflict!

*2) Extended Status Descriptions

# svn left a lock in the .svn area of some_dir

some_dir

bar.c

# the content in bar.c has local modifications

baz.c

# baz.c has property but no content modifications

# dir is part of an externals definition

3rd_party

foo.o

# svn doesn't manage foo.o

# svn manages this, but it's missing or incomplete

some_dir

# do a

to remove it from the repo

svn delete

qux

# versioned as file/dir/link, but type has changed

# svn doesn't manage this, and is set to ignore it

.screenrc

# added with history of where it came from

A +

moved_dir

moved_dir/README

# added with history and has local modifications

M +

# file is scheduled for deletion

stuff/fish.c

stuff/loot/bloo.h

# file is scheduled for addition

stuff/loot/lump.c

# file has textual conflicts from an update

stuff/loot/glub.c

# file has property conflicts from an update

xyz.c

# file is scheduled for replacement

# file or dir has been switched to a branch

stuff/squawk

# file is locked locally; lock-token present

K dog.jpg

# file is locked in the repository by other user

O cat.jpg

# file is locked locally, but lock has been broken

B bird.jpg

# file is locked locally, but lock has been stolen

T fish.jpg

See:

*3) Import Procedure

1. Create a repo (svnadmin create)

2. Import your project (svn import)

3. Do your first checkout (svn checkout)

4. Work on checked out working copy

Subversion (Svn) Cheat Sheet Page 2

Related Articles

Related forms

Related Categories