Changes between Version 4 and Version 5 of DistributedTrac

Timestamp:

Apr 11, 2010, 3:58:22 PM (14 years ago)

Author:

Christian Boos

Comment:

fix symptom of number dyslexia…

DistributedTrac

@@ -14 +14 @@
    You wouldn't even want to attempt a merge of ticket data at the file level.
    Instead, the ui should present a way to merge changes, a bit similar to what is planned for resolving conflicts during concurrent edits.
-   Have a look at the discussions in #2618, #4001 and #7145. #3006 is about merging different tickets in one, but I think it's also relevant to the topic.
+   Have a look at the discussions in #2618, #4100 and #7145. #3006 is about merging different tickets in one, but I think it's also relevant to the topic.
    Conflict resolutions could even be done incrementally, saved on the non-default branch. When there are no conflicts anymore, the merge can proceed and the changes added by the branch will be available on the default branch, at which point the "cache" db can be updated (see next point). -- cboos''
  * Searching through files would be slower than a database.