Differences

This shows you the differences between two versions of the page.

Link to this comparison view

Both sides previous revision Previous revision
Next revision
Previous revision
Next revision Both sides next revision
dev:using_git [2009/08/30 22:42]
hjunes Warn more about the duration of git svn clone.
dev:using_git [2009/09/04 20:56]
hjunes start to work with branches...
Line 89: Line 89:
 Before committing, you want make sure that you have the latest version of the source Before committing, you want make sure that you have the latest version of the source
 <​code>​ <​code>​
-git-svn rebase+git svn rebase
 </​code>​ </​code>​
 Invoking the above command Invoking the above command
Line 106: Line 106:
 Suggesting that there were no code to merge and no conflicts to solve, you can then commit back to subversion Suggesting that there were no code to merge and no conflicts to solve, you can then commit back to subversion
 <​code>​ <​code>​
-git-svn dcommit+git svn dcommit
 </​code>​ </​code>​
 You will see then the following output You will see then the following output
Line 119: Line 119:
 </​code>​ </​code>​
 As you can see, the commit has been assigned subversion'​s version number 10792. As you can see, the commit has been assigned subversion'​s version number 10792.
 +
 +===== A typical short working cycle =====
 +
 +First you check for new updates
 +<​code>​
 +git svn rebase
 +</​code>​
 +
 +Then you make your changes, compile and test
 +<​code>​
 +[... editing ...]
 +make
 +./​rosegarden
 +</​code>​
 +
 +Now lets prepare for the commit. First lets see what changes we are going to commit
 +<​code>​
 +git diff
 +</​code>​
 +
 +Add files which were changed and commit them locally
 +<​code>​
 +git add [file1 file2 ...]
 +git commit -m "​Message..."​
 +</​code>​
 +
 +Then one more check for probable new set of changes
 +<​code>​
 +git svn rebase
 +</​code>​
 +No merge was needed in this example.
 +
 +Finally, submit the changes
 +<​code>​
 +git svn dcommit
 +</​code>​
 +
 +That was it. The above set of commands is not optimal, but it works.
 +
 +===== Using TEMPORARILY a branch =====
 +
 +First you may want to **fetch** (the code word) the changes in all branches
 +<​code>​
 +git svn fetch
 +</​code>​
 +
 +
  
 
 
dev/using_git.txt ยท Last modified: 2018/02/07 17:07 (external edit)
Recent changes RSS feed Creative Commons License Valid XHTML 1.0 Valid CSS Driven by DokuWiki