path: root/doc
diff options
authorJörg Mayer <jmayer@loplof.de>2011-07-18 12:44:19 +0000
committerJörg Mayer <jmayer@loplof.de>2011-07-18 12:44:19 +0000
commit6dace0449383937167c4744c489eefc541a62b57 (patch)
treefef66f9f91a0721eecc07fcd5d3dff8392b832af /doc
parent277a56089c6492e21c0840fba67c6abbf5270e59 (diff)
Add instructions how to work with "git svn" instead of "svn"
svn path=/trunk/; revision=38080
Diffstat (limited to 'doc')
1 files changed, 29 insertions, 1 deletions
diff --git a/doc/README.developer b/doc/README.developer
index 87b53516ba..4a3041cef6 100644
--- a/doc/README.developer
+++ b/doc/README.developer
@@ -2513,7 +2513,7 @@ e_guid_t structure.
For proto_tree_add_oid(), the 'value_ptr' argument is a pointer to an
ASN.1 Object Identifier.
-For proto_tree_add_eui64(), the 'value' argument is a 64-bit integer
+For proto_tree_add_eui64(), the 'value' argument is a 64-bit integer
@@ -2965,6 +2965,34 @@ to the DISSECTOR_SRC section of epan/CMakeLists.txt
See <http://www.wireshark.org/develop.html>
+1.10a Using git with the SVN source code tree.
+ Install git and the git-svn package.
+ Run "mkdir git; cd git; git svn clone <svn-url>", e.g. if you are using
+ the anonymous svn tree, run
+ "git svn clone http://anonsvn.wireshark.org/wireshark/trunk/"
+ After that, a typical workflow may look like this (from "man git-svn"):
+ # Clone a repo (like git clone):
+ git svn clone http://svn.example.com/project/trunk
+ # Enter the newly cloned directory:
+ cd trunk
+ # You should be on master branch, double-check with ´git branch´
+ git branch
+ # Do some work and commit locally to git:
+ git commit ...
+ # Something is committed to SVN, rebase your local changes against the
+ # latest changes in SVN:
+ git svn rebase
+ # Now commit your changes (that were committed previously using git) to SVN
+ # as well as automatically updating your working HEAD:
+ git svn dcommit
+ # Append svn:ignore settings to the default git exclude file:
+ git svn show-ignore >> .git/info/exclude
1.11 Submitting code for your new dissector.
- VERIFY that your dissector code does not use prohibited or deprecated APIs