Changes between Version 4 and Version 5 of TracDiff

Timestamp:

Jun 24, 2005, 7:31:20 PM (19 years ago)

Author:

Christian Boos

Comment:

Removed reference to old changesets

TracDiff

@@ -1 +1 @@
 = Trac Diff Module =
 
-''Note 1: this module is currently being developed in source:branches/cboos-dev/anydiff-branch development branch. 
-Please use [1792] for testing.''
+''Note 1: this module is currently being developed in source:branches/cboos-dev/anydiff-branch development branch. It is also maintained in sync with recent (stable) trunk versions.''
 
 ''Note 2: that page is a prototype for the Diff documentation. It will eventually be merged with the TracChangeset documentation page''.
@@ -70 +69 @@
 == Feedback ==
 
-In order to test the above features:
- * either extract the branch, but it's slightly out-of-date compared to the trunk
- * or apply the changes on top of the trunk ([1792] as of this writing)
-
-For the second option:
-{{{
-$ cd trac/trunk
-$ svn merge -r 1760:1792 http://svn.edgewall.com/repos/trac/branches/cboos-dev/anydiff-branch .
-...
-C      trac\mimeview\api.py
-C      trac\wiki\formatter.py
-}}}
-Edit the conflicted files and solve the conflicts 
-by selecting the {{{.working}}} version.
-
-I was thinking about providing a checkbox for each file entry 
-in order to generate a ''diff'' containing only the selected changes 
-(''cherry-picking support'').
-A similar feature has also been requested in #1662.
-
 
 ''Please feel free to test, as the feature set won't change much now, and add your observations here''
 
+
+=== Cherry-picking support ===
+
+I was thinking about providing a checkbox for each file entry 
+in order to generate a ''diff'' containing only the selected changes.
+A similar feature has also been requested in #1662.
+
+=== Diff/Patch ===
+
+I've noticed that the diffs that are produced using generalized diffs
+are not really usable for {{{patch}}}. Especially for the added files.
+
+