Changes between Version 7 and Version 8 of TracDev/DevelopmentWorkflow

Timestamp:

Mar 2, 2016, 1:43:12 AM (8 years ago)

Author:

Ryan J Ollos

Comment:

Refs comment:1:ticket:12358.

TracDev/DevelopmentWorkflow

@@ -53 +53 @@
 
 '''Note''': you can always review what are the pending changes in Trac by looking at the `svn:mergeinfo` property which shows the '''eligible''' set of changesets, when viewing the target branch in the TracBrowser, eg [source:trunk].
+
+== Pushing from a DVCS to SVN
+
+If the changes were staged in a Git or Hg repository, some additional steps are needed to commit the changes to Subversion. The steps will be described for a Git repository, but will be similar for an Hg repository.
+
+You should first interactively rebase (`git rebase -i`) your changes to get them in a form that is appropriate for committing to the Subversion repository. In doing so, consider how you'd like the changes to be represented in the repository history, taking into account that we frequently interrogate the repository history to discover the cause of regressions or understand the purpose and intent of code. For example, logically related changesets may be squashed if they were staged as multiple changesets to ease the process of codereview. However, unrelated changes and refactorings should be pushed as separate changesets, so they don't obfuscate other changesets.
+
+Next, reword your log messages in a form that is appropriate for committing to the Subversion repository, prefixing each log message with the target version (e.g. `1.0.10dev:`), and referencing the appropriate ticket(s). See the [/log log] for examples.
+
+Once you've interactively rebased your Git branch and prepared your log messages, the process to push changes to Subversion is:
+* Checkout an svn working copy of the branch you'll be committing to
+* Rebase your staging branch against the HEAD of the branch you'll be committing to
+* Copy the svn metadata directory (`.svn`) of the working copy into the root of your git repository
+* Step through checkouts of your repository changesets and push each of them into Subversion
+
+Here are the same steps described in command line form:
+{{{#!sh
+$ svn checkout <target-branch> trac-svn-wc
+$ cp -r trac-svn-wc/.svn trac-git-repos/
+$ cd trac-git-repos
+$ git status -sb
+## tXYZ
+$ git checkout tXYZ~3
+$ git log --format="%B" > commit.txt
+$ svn add ...; svn del ...
+$ svn ci -F commit.txt
+$ git checkout tXYZ~2
+...
+$ git checkout tXYZ~1
+...
+$ git checkout tXYZ
+...
+}}}