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