Differences
This shows you the differences between two versions of the page.
Both sides previous revision Previous revision Next revision | Previous revision | ||
noresm:svntutorial [2013-12-10 14:16:50] 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 | ||
< | < | ||
- | alfg@pc4400: | + | alfg@pc4400: |
- | alfg@pc4400: | + | alfg@pc4400: |
</ | </ | ||
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!! | ||
- | ****************************************************************** | ||
< | < | ||
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 " |
- | 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 195: | Line 192: | ||
===== PART 7: Verify that you are happy with merge ===== | ===== PART 7: Verify that you are happy with merge ===== | ||
- | |||
- | ************************************************* | ||
- | TUTORIAL PART 7 | ||
- | *********************************************** | ||
- | VERIFY THAT YOU ARE HAPPY WITH THE MERGE | ||
< | < | ||
Line 205: | Line 197: | ||
</ | </ | ||
- | When you are happy with the diffs, do | + | Note how it is difficult to understand |
- | < | + | To configure a nice diff-viewer, |
- | alfg@pc4400: | + | |
- | </ | + | |
- | + | ||
- | ==> DONE | + | |
- | + | ||
- | NOTES: | + | |
- | + | ||
- | To configure a nice diff-viewer, | + | |
- | TWO LINES long!! | + | |
< | < | ||
diff-cmd = / | diff-cmd = / | ||
</ | </ | ||
+ | |||
+ | The script " | ||
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 229: | Line 214: | ||
</ | </ | ||
- | (Use | (pipeline) key in the " | + | (In emacs, use | (pipeline) key in the " |
The content of this script for vi users can be | The content of this script for vi users can be | ||
Line 238: | Line 223: | ||
</ | </ | ||
+ | Visually verify the diff again using the diff viewer | ||
+ | < | ||
+ | alfg@pc4400: | ||
+ | </ | ||
+ | |||
+ | When you are happy with the diffs, do | ||
+ | |||
+ | < | ||
+ | alfg@pc4400: | ||
+ | </ | ||
+ | |||
+ | ==> DONE | ||
+ | |||
+ | ===== PART 8: Merge back to trunk ===== | ||
+ | |||
+ | After the conflict is resolved and committed from branch, go back to trunk | ||
+ | |||
+ | < | ||
+ | alfg@pc4400: | ||
+ | alfg@pc4400: | ||
+ | </ | ||
+ | |||
+ | AT THIS POINT YOU WANT TO PASS THE TESTS (IF THIS WAS NORESM) | ||
+ | |||
+ | < | ||
+ | alfg@pc4400: | ||
+ | </ | ||
+ | |||
+ | ==> Observe that you don't get any conflict this time. Svn knows that the conflict is already resolved. | ||
+ | |||
+ | |||
+ | ===== Other important points ===== | ||
+ | |||
+ | * The merge is not completed until you commit! | ||
+ | * 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: | ||
+ | * When you have done a " | ||
+ | * If you insist on keeping reintegrated branches alive, there are two options: | ||
+ | - Start using another version control system | ||
+ | - Make sure you have latest svn version (version >= 1.7), Then read (and understand) | ||
+ | |