Differences between version 7 and predecessor to the previous major change of SVNNotes.
Other diffs: Previous Revision, Previous Author, or view the Annotated Edit History
| Newer page: | version 7 | Last edited on Thursday, April 13, 2006 8:07:03 pm | by JohnMcPherson | Revert |
| Older page: | version 5 | Last edited on Sunday, May 8, 2005 9:45:12 pm | by AristotlePagaltzis | Revert |
@@ -1,5 +1,14 @@
Random SubVersion notes.
+
+!!! Status Characters
+<?plugin OldStyleTable
+|_Char_|_Meaning
+|U|Updated your (unmodified?) copy to the latest version
+|C|Conflict while updating
+|M|Modified - your local version has changes that aren't in the latest version
+|G|Merged - your modified version had patches applied from the latest version
+?>
!!! Flagging a file as executable
<pre>
@@ -16,9 +25,9 @@
If automatic merging fails, after manually editing the file, remember to announce the conflict as resolved:
<verbatim>
- svn resolve
new.c
+ svn resolved
new.c
</verbatim>
!!! Deleting directories
