Context Navigation

Changes between Version 14 and Version 15 of TracDev/DevelopmentWorkflow

v14	v15
69	69	== Pushing from a DVCS to SVN
70	70
71		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.
	71	If the changes were staged in [TracTeam/Repositories your dev 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.
72	72
73	73	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 for the purpose of easing code review. However, unrelated changes and refactorings should be pushed as separate changesets so that they don't obfuscate functional changes.