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-12 13:59:37]
alfg [PART 8: Merge back to trunk] 		noresm:svntutorial [2022-05-31 09:29:32] (current)
Line 180: 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 198: 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!! (Make sure it is executable with "chmod +x scriptname")+
  
 <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 212: 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 242: Line 244:
 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>
  • noresm/svntutorial.1386856777.txt.gz
  • Last modified: 2022-05-31 09:23:24
  • (external edit)