1
0
mirror of https://github.com/openSUSE/osc.git synced 2024-11-14 00:06:15 +01:00

fix whitespace

This commit is contained in:
Pavol Rusnak 2010-02-28 02:30:13 +01:00
parent 22b684fa38
commit 8d551e0a69
13 changed files with 149 additions and 148 deletions

3
README
View File

@ -14,6 +14,7 @@ RPM packages are here (rpm-md repository):
http://download.opensuse.org/repositories/openSUSE:/Tools/ http://download.opensuse.org/repositories/openSUSE:/Tools/
To install from svn, do To install from svn, do
python setup.py build python setup.py build
python setup.py install python setup.py install
# create a symlink 'osc' in your path pointing to osc.py. # create a symlink 'osc' in your path pointing to osc.py.
@ -146,7 +147,7 @@ Update a working copy
osc up [pac_dir] # update a single package by its path osc up [pac_dir] # update a single package by its path
osc up * # from within a project dir, update all packages osc up * # from within a project dir, update all packages
osc up # from within a project dir, update all packages osc up # from within a project dir, update all packages
AND check out all newly added packages # AND check out all newly added packages
If an update can't be merged automatically, a file is in 'C' (conflict) If an update can't be merged automatically, a file is in 'C' (conflict)
state, and conflicts are marked with special <<<<<<< and >>>>>>> lines. state, and conflicts are marked with special <<<<<<< and >>>>>>> lines.