Version Control with Subversion phần 7 potx

--relocate FROM TO [PATH...] Used with the svn switch subcommand, changes the location of the repository that your working copy references.. If your working copy is out of date or you ha

Goes through all the motions of running a command, but makes no actual changes—either

on disk or in the repository

de -extensions(-x)ARGS

Specifies an argument or arguments that Subversion should pass to an external diff

com-mand This option is valid only when used with the svn diff or svn merge commands, with

the diff-cmd option If you wish to pass multiple arguments, you must enclose all of

them in quotes (for example, svn diff diff-cmd /usr/bin/diff -x "-b -E").

file(-F)FILENAME

Uses the contents of the named file for the specified subcommand, though different

sub-commands do different things with this content For example, svn commit uses the tent as a commit log, whereas svn propset uses it as a property value.

con -force

Forces a particular command or operation to run There are some operations that sion will prevent you from doing in normal usage, but you can pass the force option to tellSubversion “I know what I'm doing as well as the possible repercussions of doing it, so let

Subver-me at 'em” This option is the programmatic equivalent of doing your own electrical workwith the power on—if you don't know what you're doing, you're likely to get a nasty shock. force-log

Forces a suspicious parameter passed to the message(-m) or file(-F) options to

be accepted as valid By default, Subversion will produce an error if parameters to theseoptions look like they might instead be targets of the subcommand For example, if youpass a versioned file's path to the file (-F) option, Subversion will assume you'vemade a mistake, that the path was instead intended as the target of the operation, and thatyou simply failed to provide some other—unversioned—file as the source of your log mes-sage To assert your intent and override these types of errors, pass the force-logop-tion to subcommands that accept log messages

Show only the firstNUMlog messages.

Prevents Subversion from printing differences for added files The default behavior when

you add a file is for svn diff to print the same differences that you would see if you had

ad-ded the entire contents of an existing (empty) file

no-diff-deleted

Prevents Subversion from printing differences for deleted files The default behavior when

you remove a file is for svn diff to print the same differences that you would see if you had

left the file but removed all the content

no-ignore

Shows files in the status listing that would normally be omitted since they match a pattern

in theglobal-ignoresconfiguration option or the svn:ignoreproperty See the tion called “Config” and the section called “Ignoring Unversioned Items” for more informa-tion

line—otherwise, if it is needed, Subversion will prompt you for it.

quiet(-q)

Requests that the client print only essential information while performing an operation. recursive(-R)

Makes a subcommand recurse into subdirectories Most subcommands recurse by default

relocate FROM TO [PATH ]

Used with the svn switch subcommand, changes the location of the repository that your

working copy references This is useful if the location of your repository changes and you

have an existing working copy that you'd like to continue to use See svn switch for an

ex-ample

revision(-r)REV

Indicates that you're going to supply a revision (or range of revisions) for a particular ation You can provide revision numbers, revision keywords or dates (in curly braces), asarguments to the revision option If you wish to provide a range of revisions, you canprovide two revisions separated by a colon For example:

Causes a Subversion subcommand which is traversing the history of a versioned resource

to stop harvesting that historical information when a copy—that is, a location in historywhere that resource was copied from another location in the repository—is encountered. strict

Causes Subversion to use strict semantics, a notion which is rather vague unless talking

about specific subcommands (namely, svn propget).

subcom-about every file, or additional information regarding its actions.

version

Prints the client version info This information not only includes the version number of theclient, but also a listing of all repository access modules that the client can use to access aSubversion repository With quiet(-q) it prints only the version number in a compactform

You can add a directory without adding its contents:

$ svn add non-recursive otherdir

Normally, the command svn add * will skip over any directories that are already under version

control Sometimes, however, you may want to add every unversioned object in your workingcopy, including those hiding deeper down Passing the force option makes svn add re-

curse into versioned directories:

3 sally This is a README file.

Even if svn blame says that Harry last modified readme.txt in revision 5, you'll have to

exam-ine exactly what the revision changed to be sure that Harry changed the context of the

line—he may have just adjusted the whitespace

This is a README file.

You should read this

If your working copy is out of date (or you have local modifications) and you want

to see theHEAD revision of a file in your working copy, svn cat will automatically

fetch theHEADrevision when you give it a path:

$ cat foo.c

This file is in my local working copy

and has changes that I've made

$ svn cat foo.c

Latest revision fresh from the repository!

Check out a working copy from a repository IfPATHis omitted, the basename of the URL will

be used as the destination If multiple URLs are given each will be checked out into a ectory ofPATH, with the name of the subdirectory being the basename of the URL

Check out a working copy into a directory calledmine:

$ svn checkout file:///tmp/repos/test mine

Check out two different directories into two separate working copies:

$ svn checkout file:///tmp/repos/test file:///tmp/repos/quiz

A test/a

Check out two different directories into two separate working copies, but place both into a

dir-ectory calledworking-copies:

$ svn checkout file:///tmp/repos/test file:///tmp/repos/quiz working-copies

If you interrupt a checkout (or something else interrupts your checkout, like loss of connectivity,

etc.), you can restart it either by issuing the identical checkout command again, or by updating

the incomplete working copy:

$ svn checkout file:///tmp/repos/test test

If, for some reason, an svn update fails due to a problem running an external diff program

(e.g user input or network failure), pass the diff3-cmd to allow cleanup to complete anymerging with your external diff program You can also specify any configuration directory withthe config-diroption, but you should need these options extremely infrequently

com-or edit the message again.

Commit a simple modification to a file with the commit message on the command line and animplicit target of your current directory (“.”):

$ svn commit -m "added howto section."

$ svn commit file file_under_vc.txt foo.c

svn: The log message file is under version control

svn: Log message file is a versioned file; use ' force-log' to override

$ svn commit force-log file file_under_vc.txt foo.c

Transmitting file data

Committed revision 6

To commit a file scheduled for deletion:

$ svn commit -m "removed file 'c'."

Committed revision 7

Complete server-side copy This is usually used to branch and tag.

You can only copy files within a single repository Subversion does not supportcross-repository copying

Alternate Names

cp

Changes

Repository if destination is a URL

Working copy if destination is a WC path

Copy an item within your working copy (just schedules the copy—nothing goes into the

reposit-ory until you commit):

$ svn copy foo.txt bar.txt

$ svn status

Copy an item in your working copy to a URL in the repository (an immediate commit, so you

must supply a commit message):

$ svn copy near.txt file:///tmp/repos/test/far-away.txt -m "Remote copy."

Committed revision 8

Copy an item from the repository to your working copy (just schedules the copy—nothing goes

into the repository until you commit):

This is the recommended way to resurrect a dead file in your repository!

$ svn copy file:///tmp/repos/test/far-away near-here

And finally, copying between two URLs:

$ svn copy file:///tmp/repos/test/far-away file:///tmp/repos/test/over-there -m "remote copy."

Committed revision 9

This is the easiest way to “tag” a revision in your repository—just svn copy that

revision (usuallyHEAD) into your tags directory

$ svn copy file:///tmp/repos/test/trunk file:///tmp/repos/test/tags/0.6.32-prerelease -m "tag tree"

Committed revision 12

And don't worry if you forgot to tag—you can always specify an older revision and tag anytime:

$ svn copy -r 11 file:///tmp/repos/test/trunk file:///tmp/repos/test/tags/0.6.32-prerelease -m "Forgot to tag at rev 11"

Committed revision 13.

director-Items specified by URL are deleted from the repository via an immediate commit MultipleURLs are committed atomically.

Using svn to delete a file from your working copy deletes your local copy of the file, but merely

schedules it to be deleted from the repository When you commit, the file is deleted in the pository

Deleting a URL, however, is immediate, so you have to supply a log message:

$ svn delete -m "Deleting file 'yourfile'" file:///tmp/repos/test/yourfileCommitted revision 15

Here's an example of how to force deletion of a file that has local mods:

$ svn delete over-there

svn: Attempting restricted operation for modified resource

svn: Use force to override this restriction

svn: 'over-there' has local modifications

$ svn delete force over-there

svn diff — Display the differences between two revisions or paths

Synopsis

diff [-c M | -r N[:M]] [TARGET[@REV] ]

diff [-r N[:M]] old=OLD-TGT[@OLDREV] [ new=NEW-TGT[@NEWREV]] [PATH ]

diff OLD-URL[@OLDREV] NEW-URL[@NEWREV]

Description

Display the differences between two paths The ways you can use svn diff are:

Use just svn diff'to display local modifications in a working copy.

Display the changes made toTARGETs as they are seen inREVbetween two revisions. GETs may be all working copy paths or allURLs IfTARGETs are working copy paths,Ndefaults

TAR-toBASEandMto the working copy; ifURLs,Nmust be specified andMdefaults to HEAD The

“-c M” option is equivalent to “-r N:M” whereN = M-1 Using “-c -M” does the reverse: “-r M:N”whereN = M-1

Display the differences between OLD-TGTas it was seen inOLDREVand NEW-TGTas it wasseen ainNEWREV.PATHs, if given, are relative to OLD-TGTandNEW-TGTand restrict the out-put to differences for those paths OLD-TGT and NEW-TGT may be working copy paths or

URL[@REV].NEW-TGT defaults toOLD-TGTif not specified “-r N” makes OLDREV default to

N, -r N:M makesOLDREVdefault toNandNEWREVdefault toM

Shorthand for svn diff old=OLD-URL[@OLDREV] new=NEW-URL[@NEWREV]

svn diff -r N:M URL is shorthand for svn diff -r N:M old=URL new=URL.

svn diff [r N[:M]] URL1[@N] URL2[@M] is shorthand for svn diff [r N[:M]] old=URL1 -new=URL2.

-If TARGETis a URL, then revs N and M can be given either via the revision or by using

“@” notation as described earlier

IfTARGETis a working copy path, then the revisionoption means:

The client compares base and working copies ofTARGET

If the alternate syntax is used, the server comparesURL1 andURL2 at revisionsN andM spectively If eitherNorMare omitted, a value ofHEADis assumed

re-By default, svn diff ignores the ancestry of files and merely compares the contents of the two

files being compared If you use notice-ancestry, the ancestry of the paths in question

will be taken into consideration when comparing revisions (that is, if you run svn diff on two

files with identical contents but different ancestry you will see the entire contents of the file ashaving been removed and added again)

+++ COMMITTERS (working copy)

See what changed in the fileCOMMITTERSrevision 9115:

$ svn diff -c 9115 COMMITTERS

Index: COMMITTERS

=================================================================== - COMMITTERS (revision 3900)

+++ COMMITTERS (working copy)

See how your working copy's modifications compare against an older revision:

$ svn diff -r 3900 COMMITTERS

Index: COMMITTERS

===================================================================

- COMMITTERS (revision 3900)

+++ COMMITTERS (working copy)

Compare revision 3000 to revision 3500 using “@” syntax:

$ svn diff http://svn.collab.net/repos/svn/trunk/COMMITTERS@3000 http://svn.collab.net/repos/svn/trunk/COMMITTERS@3500Index: COMMITTERS

Compare revision 3000 to revision 3500 of only three files intrunkusing range notation:

$ svn diff -r 3000:3500 old http://svn.collab.net/repos/svn/trunk COMMITTERS README HACKING

If you have a working copy, you can obtain the differences without typing in the long URLs:

Use diff-cmd CMD -xto pass arguments directly to the external diff program

$ svn diff diff-cmd /usr/bin/diff -x "-i -b" COMMITTERS

Index: COMMITTERS

===================================================================

0a1,2

> This is a test

>

svn export — Export a clean directory tree

Synopsis

svn export [-r REV] URL[@PEGREV] [PATH]

svn export [-r REV] PATH1[@PEGREV] [PATH2]

Description

The first form exports a clean directory tree from the repository specified by URL, at revision

REVif it is given, otherwise at HEAD, intoPATH IfPATHis omitted, the last component of the

URLis used for the local directory name

The second form exports a clean directory tree from the working copy specified byPATH1into

PATH2 All local changes will be preserved, but files not under version control will not becopied

Export from your working copy (doesn't print every file and directory):

$ svn export a-wc my-export

Export complete

Export directly from the repository (prints every file and directory):

$ svn export file:///tmp/repos my-export

$ svn export file:///tmp/repos my-export native-eol CRLF

Recursively commit a copy ofPATHtoURL IfPATHis omitted “.” is assumed Parent

director-ies are created in the repository as necessary

This imports the local directory myproj into trunk/misc in your repository The directory

trunk/misc need not exist before you import into it—svn import will recursively create

dir-ectories for you

$ svn import -m "New import" myproj http://svn.red-bean.com/repos/trunk/misc

…

Transmitting file data

Committed revision 16

Be aware that this will not create a directory namedmyprojin the repository If that's what you

want, simply addmyprojto the end of the URL:

$ svn import -m "New import" myproj http://svn.red-bean.com/repos/trunk/misc/myproj

…

Transmitting file data

Committed revision 16

After importing data, note that the original tree is not under version control To start working,

you still need to svn checkout a fresh working copy of the tree.

• Last Changed Author

• Last Changed Revision

• Last Changed Date

• Lock Token

• Lock Owner

• Lock Created (date)

• Lock Expires (date)

Additional kinds of information available only for working copy paths are:

• Schedule

• Copied From URL

• Copied From Rev

• Text Last Updated

• Properties Last Updated

• Checksum