[Crossfire-wiki] [Crossfire DokuWiki] page changed: dev_todo:mapdiff

[no-reply_wiki at metalforge.org]

A page in your DokuWiki was added or changed. Here are the details:



Date        : 2006/09/29 18:41

Browser     : Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.8.1b1) Gecko/20
060713 BonEcho/2.0b1

IP-Address  : 66.222.158.169

Hostname    : d66-222-158-169.abhsia.telus.net

Old Revision: http://wiki.metalforge.net/doku.php/dev_todo:mapdiff?rev=1
159548887

New Revision: http://wiki.metalforge.net/doku.php/dev_todo:mapdiff

Edit Summary: 

User        : rednaxela



@@ -14,8 +14,6 @@

      * Allow the user to resolve when applying a patch, perhaps make it a
 friendly semi-automated map-format-aware menu to resolve the ambiguity, a
s opposed to the not-as-smart text based manual conflict resolving methods
.

  

  ===== Issues with the proposed system =====

  

- It is not clear if the proposed system offers significant advantages ove
r diff with extended context (e.g., using "''diff -u 20''" instead of "''d
iff -u''").

- 

- Even if there is a theoretical risk for rejected patches due to conflict
s in the extended context, this may not be a problem in practice.  Also, t
he fuzz factor in patch can be increased (e.g., "''patch -F 15''") in orde
r to reduce the risk of conflicts.  So if the map or player object has not
 been modified, there will be a perfect match and the patch will be applie
d without problems.  If there some differences in the 20 lines of context,
 then patch will report that the hunk has been applied with some fuzziness
.  In the end, it is very likely that diff and patch will do exactly what 
we expect them to do, without having to implement our own tools.

- 

+   * It is not clear if the proposed system offers significant advantages
 over diff with extended context (e.g., using "''diff -u 20''" instead of 
"''diff -u''"). \\ \\ Even if there is a theoretical risk for rejected pat
ches due to conflicts in the extended context, this may not be a problem i
n practice.  Also, the fuzz factor in patch can be increased (e.g., "''pat
ch -F 15''") in order to reduce the risk of conflicts.  So if the map or p
layer object has not been modified, there will be a perfect match and the 
patch will be applied without problems.  If there some differences in the 
20 lines of context, then patch will report that the hunk has been applied
 with some fuzziness.  In the end, it is very likely that diff and patch w
ill do exactly what we expect them to do, without having to implement our 
own tools.

+     * Discussed with the one who wrote this comment on IRC. Consensus se
ems to be that it's low priority, but may be useful to some degree. --- //
[[alex_sch at telus.net|Alex Schultz]] 2006/09/29 18:38//







-- 

This mail was generated by DokuWiki at

http://wiki.metalforge.net/