Changes between Version 3 and Version 4 of TracDiff
- Timestamp:
- Jun 15, 2005, 10:29:34 AM (19 years ago)
Legend:
- Unmodified
- Added
- Removed
- Modified
-
TracDiff
v3 v4 1 1 = Trac Diff Module = 2 2 3 ''Note 1: this module is currently being developed in source:branches/cboos-dev/anydiff-branch development branch. It's feature complete as of [1777]. Some refactoring work is still needed, though'' 3 ''Note 1: this module is currently being developed in source:branches/cboos-dev/anydiff-branch development branch. 4 Please use [1792] for testing.'' 4 5 5 6 ''Note 2: that page is a prototype for the Diff documentation. It will eventually be merged with the TracChangeset documentation page''. … … 24 25 between alternative versions. 25 26 26 This is where Trac comes to the rescue: the TracBrowser27 allows any path in the repository, at any given revision 28 to be selected as the ''Base for Diff'',29 i.e. the '''old''' file (or directory) which 30 can be compared to any other existing '''new'''31 path/revision pair.27 This is where Trac comes to the rescue: in the TracBrowser, 28 the path/revision currently examined can be selected 29 to be the ''Base'' (i.e. the ''old'' path/revision pair) 30 for a Diff operation. 31 The TracBrowser enters in a specific '''Diff''' mode reminding you 32 to select a ''Target'' (i.e. the ''new'' path/revision pair). 32 33 33 34 The resulting set of differences consist in the changes 34 that would be necessary to makeon the ''Base'' in order35 to make it look like the target of the comparison.35 that should be applied on the ''Base'' in order 36 to make it look like the ''Target'' of the Diff. 36 37 37 38 For convenience, it is possible to invert the roles 38 for the '''old''' and the '''new''' path/revision pairs. 39 for the '''old''' and the '''new''' path/revision pairs 40 by clicking the ''Reverse Diff'' link on the diff page. 39 41 40 42 === Checking the Last Changes === … … 45 47 46 48 This shows the relevant TracChangeset information, but 47 48 49 restricted to the path being browsed, and with a link 49 50 to the next ''Previous Diff'', making it convenient to … … 51 52 52 53 Of course, if one is doing that on the root of the 53 repository, there 's will be no path restrictions54 repository, there will be no path restriction 54 55 and the full changeset will be shown. 56 55 57 56 58 == Looking at the Differences == 57 59 58 See TracChangeset for now, as the display is very similar. 60 See TracChangeset for now, as the display of the 61 differences is identical to what is described there. 62 Actually, the TracChangeset is now a particular case 63 of TracDiff. 59 64 60 Except: 61 * the Changeset information is shown only for the last mode 62 (''Checking the Last Changes'') 63 * the revision information for the individual files 64 being examined is the one corresponding to their creation. 65 This helps to discover which side is the ''real'' old file 66 while examining parallel lines of development. 67 68 In relation to the latest point, I'm thinking about providing 69 a checkbox for each file entry in order to generate a ''diff'' 70 containing only the selected changes (''cherry-picking support''). 65 Note however that the Changeset information is only displayed 66 when it makes sense, i.e. when there's only one changeset involved 67 in the difference being examined. 71 68 72 69 73 70 == Feedback == 74 71 72 In order to test the above features: 73 * either extract the branch, but it's slightly out-of-date compared to the trunk 74 * or apply the changes on top of the trunk ([1792] as of this writing) 75 76 For the second option: 77 {{{ 78 $ cd trac/trunk 79 $ svn merge -r 1760:1792 http://svn.edgewall.com/repos/trac/branches/cboos-dev/anydiff-branch . 80 ... 81 C trac\mimeview\api.py 82 C trac\wiki\formatter.py 83 }}} 84 Edit the conflicted files and solve the conflicts 85 by selecting the {{{.working}}} version. 86 87 I was thinking about providing a checkbox for each file entry 88 in order to generate a ''diff'' containing only the selected changes 89 (''cherry-picking support''). 90 A similar feature has also been requested in #1662. 91 92 75 93 ''Please feel free to test, as the feature set won't change much now, and add your observations here'' 76 94