noresm:svntutorial

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
noresm:svntutorial [2013-12-10 14:35:09]
alfg 		noresm:svntutorial [2022-05-31 09:29:32] (current)
Line 64: Line 64:
 CHECK OUT TRUNK FOR ONE DEVELOPER CHECK OUT TRUNK FOR ONE DEVELOPER
 <file> <file>
-alfg@pc4400:~$svn checkout file://$HOME/svnrepos/testproject/trunk trunk +alfg@pc4400:~/twoDevelopers$svn checkout file://$HOME/svnrepos/testproject/trunk trunk 
-alfg@pc4400:~$cd trunk+alfg@pc4400:~/twoDevelopers$cd trunk
 </file> </file>
  
Line 171: Line 171:
  
 =====PART 6: Go back to merge operation and use merge tool ===== =====PART 6: Go back to merge operation and use merge tool =====
- 
-*************************************************************** 
-TUTORIAL PART 6: GO BACK TO MERGE OPERATION AND USE MERGE TOOL!! 
-****************************************************************** 
  
 <file> <file>
Line 184: Line 180:
 ==> emacs or vi should be invoked in "merge mode" ==> emacs or vi should be invoked in "merge mode"
  
-The vi script shows (your, ancestor, mine) on top and output below +//The vi script// shows (your, ancestor, mine) on top and output below. Move around in the different windows with "ctrl+w+arrow". When in the upper windows you can use "[c" and "]p"] go move to previous/next diffs. 
-the emacs script shows (yours, mine) on top and merged version (including common ancestor) below+ 
 +//the emacs script// shows (yours, mine) on top and merged version (including common ancestor) below
  
 All editing should happen in the lowest part of the editor window All editing should happen in the lowest part of the editor window
Line 202: Line 199:
 Note how it is difficult to understand the diff ==> we need to configure a diff tool! Note how it is difficult to understand the diff ==> we need to configure a diff tool!
  
-To configure a nice diff-viewer, you need to replace a line in your $HOME/.subversion/config. (use a file somewhere on your PC). The script is only  +To configure a nice diff-viewer, you need to replace a line in your $HOME/.subversion/config file like this:  
-TWO LINES long!!+
  
 <file> <file>
 diff-cmd = /home/alfg/bin/diffwrap.sh  diff-cmd = /home/alfg/bin/diffwrap.sh 
 </file> </file>
 +
 +The script "diffwrap.sh" has be created somewhere on your PC. The script is only TWO LINES long!! (Make sure it is executable with "chmod +x scriptname")
  
 The content of this script (only two lines) for emacs users can be:  The content of this script (only two lines) for emacs users can be: 
Line 216: Line 214:
 </file> </file>
  
-(Use | (pipeline) key in the "ediff" dialog to toggle between vertical/horizontal diff view)+(In emacs, use | (pipeline) key in the "ediff" dialog to toggle between vertical/horizontal diff view)
  
 The content of this script for vi users can be The content of this script for vi users can be
Line 225: Line 223:
 </file> </file>
  
-Verify the diff again using the diff viewer+Visually verify the diff again using the diff viewer
 <file> <file>
 alfg@pc4400:~/twoDevelopers/aBranch$ svn diff alfg@pc4400:~/twoDevelopers/aBranch$ svn diff
Line 243: Line 241:
  
 <file> <file>
 +alfg@pc4400:~/twoDevelopers/trunk$ svn update
 alfg@pc4400:~/twoDevelopers/trunk$ svn merge --reintegrate file://$HOME/svnrepos/testproject/branches/aBranch alfg@pc4400:~/twoDevelopers/trunk$ svn merge --reintegrate file://$HOME/svnrepos/testproject/branches/aBranch
 </file> </file>
 +
 +AT THIS POINT YOU WANT TO PASS THE TESTS (IF THIS WAS NORESM)
  
 <file> <file>
Line 258: Line 259:
   * You have to know if you are doing a reintegrate merge or a merge from trunk (see noresm wiki)   * You have to know if you are doing a reintegrate merge or a merge from trunk (see noresm wiki)
   * You can undo the merge with alfg@pc4400:~/twoDevelopers/aBranch$ svn revert -R .   * You can undo the merge with alfg@pc4400:~/twoDevelopers/aBranch$ svn revert -R .
-  * When you have done a "reintegrate merge", consider  your branch dead! (remove it and create it again if needed)+  * When you have done a "reintegrate merge", consider  your branch dead! (svn delete branchUrl -m "removed reintegrated branch aBranch")
   * If you insist on keeping reintegrated branches alive, there are two options:   * If you insist on keeping reintegrated branches alive, there are two options:
       - Start using another version control system       - Start using another version control system
       - Make sure you have latest svn version (version >= 1.7), Then read (and understand)  http://svnbook.red-bean.com/en/1.7/svn.branchmerge.advanced.html#svn.branchmerge.advanced.reintegratetwice       - Make sure you have latest svn version (version >= 1.7), Then read (and understand)  http://svnbook.red-bean.com/en/1.7/svn.branchmerge.advanced.html#svn.branchmerge.advanced.reintegratetwice
      
  • noresm/svntutorial.1386686109.txt.gz
  • Last modified: 2022-05-31 09:23:24
  • (external edit)