| 1 | = RevtreePlugin enhancer for SVN 1.5 or later = |
| 2 | |
| 3 | == Description == |
| 4 | |
| 5 | !MergeInfoEnhancer is a plugin for the RevtreePlugin: it analyses the |
| 6 | properties that are added by svn on merge operations and renders a graphical |
| 7 | representation of these merge operations between the repository branches. |
| 8 | |
| 9 | == Overview == |
| 10 | |
| 11 | The plugin is in a very early development stage. SVN 1.5 has yet to be |
| 12 | released (April '08 30^th^) |
| 13 | |
| 14 | == How it works == |
| 15 | |
| 16 | The !MergeInfoEnhancer plugin looks for `svn:mergeinfo` properties and attempts |
| 17 | to find the merge operations between the SVN repository branches. For now, it |
| 18 | only deals with global merge operations. |
| 19 | |
| 20 | == Installation == |
| 21 | |
| 22 | === Build the plugin === |
| 23 | |
| 24 | As with any other plugin, download the plugin code, and build a plugin egg |
| 25 | file. The !MergeInfoEnhancer plugin source code comes with the RevtreePlugin |
| 26 | (see RevtreePlugin#Installation), but is not built along with the RevtreePlugin |
| 27 | egg. |
| 28 | |
| 29 | To build the !MergeInfoEnhancer plugin, change the current directory to the |
| 30 | `enhancers` and build the egg file: |
| 31 | {{{ |
| 32 | $ cd revtreeplugin/0.11/enhancers/mergeinfoenhancer |
| 33 | $ python setup.py bdist_egg |
| 34 | }}} |
| 35 | then copy the egg file to the global plugin directory or the project plugin |
| 36 | directory |
| 37 | |
| 38 | === Enable the plugin === |
| 39 | |
| 40 | From the [t:wiki:WebAdmin WebAdmin] plugin interface or from your `trac.ini` |
| 41 | file, enable the !MergeInfoEnhancer plugin.[[BR]] |
| 42 | The !MergeEnhancer plugin appears as `mergeinfoenhancer.enhancer` in the |
| 43 | plugin list. |
| 44 | |
| 45 | Obviously the revtree is also enabled, which means that your `trac.ini` file |
| 46 | should look like the following snippet: |
| 47 | {{{ |
| 48 | [components] |
| 49 | revtree.* = enabled |
| 50 | mergeinfoenhancer.enhancer.mergeinfoenhancer = enabled |
| 51 | }}} |
| 52 | |
| 53 | The !MergeEnhancer plugin is better used in conjunction with the default |
| 54 | !SimpleEnhancer plugin that is self-contained in the RevtreePlugin. The |
| 55 | default plugin is useful to depict the initial changeset of a new branch. The |
| 56 | MergeInfoEnhancer plugin does not track branch creation operations, so it is |
| 57 | recommended to keep the !SimpleEnhancer feature enabled when the |
| 58 | MergeInfoEhnancer plugin is enabled. |
| 59 | |
| 60 | You can perform the same operations from the [t:wiki:WebAdmin WebAdmin] |
| 61 | interface. |
| 62 | |
| 63 | == Rendering == |
| 64 | |
| 65 | [[Image(RevtreePlugin/MergeEnhancer:revtree-svnmerge.png)]][[br]] |
| 66 | ''The svnmerge plugin enhancer in action'' |
| 67 | |
| 68 | The source changesets of a svnmerge operation are outlined with a light |
| 69 | colored box, which reminds the color of the destination changeset (that is the |
| 70 | color of the branch of the ''merged'' changeset). |
| 71 | |
| 72 | The merge operation is represented with an arrow of the same color as the |
| 73 | destination branch as well. |
| 74 | |
| 75 | == Author/Contributors == |
| 76 | * '''Author''' [wiki:eblot] |
| 77 | |