Differences between version 5 and revision by previous author of SVNNotes.
Other diffs: Previous Major Revision, Previous Revision, or view the Annotated Edit History
| Newer page: | version 5 | Last edited on Sunday, May 8, 2005 9:45:12 pm | by AristotlePagaltzis | Revert |
| Older page: | version 4 | Last edited on Friday, May 6, 2005 12:05:00 am | by MattBrown | Revert |
@@ -1,12 +1,38 @@
-Random notes about [
SubVersion] usage
.
+Random SubVersion notes
.
+!!! Flagging a file as executable
+
+ <pre>
+ svn propset svn:executable on ''filename''
+ </pre>
+
+!!! Merging issues
+
+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.
+
+ <verbatim>
+ svn merge new.c -r1:5 ../old/prevnew.c
+ </verbatim>
+
+If automatic merging fails, after manually editing the file, remember to announce the conflict as resolved:
+
+ <verbatim>
+ svn resolve new.c
+ </verbatim>
+
+!!! Deleting directories
+
+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.
+
+This might be fixed in 1.1.14.
!!! Removing revisions from a repository
-I had a situation where I wanted
to remove the last X revisions from my
repository. You
can accomplish
this with the following commands
+If you want
to remove the last X revisions from a
repository, you
can do it
this way:
-<verbatim>
-matt@argon:~/tmp2$
svnadmin create repo2;
svnadmin dump -r :173 repo1 | svnadmin load repo2
-</verbatim>
+
<verbatim>
+ svnadmin create repo2
+
svnadmin dump -r :173 repo1 | svnadmin load repo2
+ </verbatim>
-This creates a new repository (
repo2)
and dumps revisions 0 to 173 (inclusive) from repo1 into it.
+This creates a new repository called <tt>
repo2</tt>
and dumps revisions 0 to 173 (inclusive) from <tt>
repo1</tt>
into it.
