Changes between Version 14 and Version 15 of GitMirror
- Timestamp:
- 10/24/2012 02:03:15 AM (7 months ago)
Legend:
- Unmodified
- Added
- Removed
- Modified
-
GitMirror
v14 v15 2 2 3 3 If you want to develop a patch for Twisted (as described in the BasicGuideToContributingCode) but prefer to use Git rather than SVN, this is the section for you. 4 5 For other version control systems, see [wiki:VcsWorkflows DVCS Workflows]. 4 6 5 7 == Creating a Git clone == … … 58 60 If that takes longer than 30 seconds to run, and eventually prints an error message, this is a clue that `git svn` has gotten confused about how your current branch connects to the imported SVN history. Either `git checkout` a git branch that's based on an SVN branch or (if you're already on such a branch, and it's broken) use `git reset some-remote-branch-name` to make sure your local branch is pointing exactly at a commit that was imported from SVN. 59 61 60 = For Twisted developers = 62 ---- 63 64 = For Twisted core developers = 61 65 62 66 If you are a Twisted developer and want to try developing Twisted via `git svn`, you are Very Brave and will need all the help you can get. Here are some chicken-scratches left on the poorly-lit cavern walls by previous explorers. … … 83 87 == git svn branching == 84 88 85 Follow the [http://twistedmatrix.com/documents/current/core/development/policy/svn-dev.html#auto6 standard Twisted branch-name conventions] when creating branches with Git. In the following example, `$BRANCH_NAME` means the name of the branch you're trying to create. 89 Follow the [http://twistedmatrix.com/documents/current/core/development/policy/svn-dev.html#auto6 standard Twisted branch-name conventions] when creating branches with Git. In the following example, `$BRANCH_NAME` means the name of the branch you're trying to create. 86 90 87 91 {{{
