| Rev | Author | # | Line |
|---|---|---|---|
| 7 | JohnMcPherson | 1 | Random SubVersion notes. |
| 10 | PhilMurray | 2 | |
| 11 | AristotlePagaltzis | 3 | !!! Status Characters |
| 10 | PhilMurray | 4 | |
| 7 | JohnMcPherson | 5 | <?plugin OldStyleTable |
| 8 | JohnMcPherson | 6 | |*Char*|*Meaning* |
| 7 | JohnMcPherson | 7 | |U|Updated your (unmodified?) copy to the latest version |
| 8 | |C|Conflict while updating | ||
| 9 | |M|Modified - your local version has changes that aren't in the latest version | ||
| 10 | |G|Merged - your modified version had patches applied from the latest version | ||
| 11 | ?> | ||
| 12 | |||
| 13 | !!! Flagging a file as executable | ||
| 14 | |||
| 15 | <pre> | ||
| 16 | svn propset svn:executable on ''filename'' | ||
| 17 | </pre> | ||
| 18 | |||
| 19 | !!! Merging issues | ||
| 20 | |||
| 21 | If you change the name of a file remember to include the old name at the end of the merge, or you will get a weird error message. | ||
| 22 | |||
| 23 | <verbatim> | ||
| 24 | svn merge new.c -r1:5 ../old/prevnew.c | ||
| 25 | </verbatim> | ||
| 26 | |||
| 27 | If automatic merging fails, after manually editing the file, remember to announce the conflict as resolved: | ||
| 28 | |||
| 29 | <verbatim> | ||
| 30 | svn resolved new.c | ||
| 31 | </verbatim> | ||
| 32 | |||
| 33 | !!! Deleting directories | ||
| 34 | |||
| 35 | After <tt>svn delete</tt>, you must manually delete the directory afterwards, otherwise the next <tt>svn commit</tt> will fail with a weird error message. | ||
| 36 | |||
| 37 | This might be fixed in 1.1.14. | ||
| 38 | |||
| 39 | !!! Removing revisions from a repository | ||
| 40 | |||
| 41 | If you want to remove the last X revisions from a repository, you can do it this way: | ||
| 42 | |||
| 43 | <verbatim> | ||
| 44 | svnadmin create repo2 | ||
| 45 | svnadmin dump -r 0:173 repo1 | svnadmin load repo2 | ||
| 46 | </verbatim> | ||
| 47 | |||
| 48 | This creates a new repository called <tt>repo2</tt> and dumps revisions 0 to 173 (inclusive) from <tt>repo1</tt> into it. | ||
| 11 | AristotlePagaltzis | 49 | |
| 50 | !!! Getting rid of external items in your repository | ||
| 51 | |||
| 52 | <verbatim> | ||
| 53 | svn propdel svn:externals | ||
| 54 | </verbatim> | ||
| 9 | IanMcDonald | 55 | |
| 56 | !!! Checking out a project to use | ||
| 57 | |||
| 58 | If you want to checkout a local repository into the current directory type: | ||
| 59 | |||
| 60 | <verbatim> | ||
| 61 | svn co file:///home/my-svn-dir/name-of-my-repository . | ||
| 13 | DavidLeaver | 62 | </verbatim> |
| 63 | |||
| 64 | !!! SVN+SSH on a port other than 22 | ||
| 65 | |||
| 66 | Open the file ~~/.subversion/config in your favorite text editor.%%% | ||
| 67 | In the section ~[tunnels] add a line like follows (for port 222)~: | ||
| 68 | <verbatim> | ||
| 69 | ssh2 = $SVN_SSH ssh -p 222 | ||
| 70 | </verbatim> | ||
| 71 | Then check out your repository using the new tunnel~: | ||
| 72 | <verbatim> | ||
| 73 | svn co svn+ssh2://my.svn.server/path/to/svn | ||
| 9 | IanMcDonald | 74 | </verbatim> |
| 14 | LawrenceDoliveiro | 75 | |
| 76 | ---- | ||
| 16 | LawrenceDoliveiro | 77 | CategoryVersionControl |
lib/blame.php:177: Warning: Invalid argument supplied for foreach() (...repeated 2 times)