[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 11:54

Browser     : Mozilla/5.0 (X11; U; SunOS sun4u; en-US; rv:1.8.0.4) Gecko/2
0060602 Firefox/1.5.0.4

IP-Address  : 212.117.81.29

Hostname    : 212.117.81.29

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

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

Edit Summary: mention that diff and patch are probably sufficient

User        : raphael



@@ -11,7 +11,11 @@

      * Include data such as, when the object is in another object, what i
t's container object is.

    * Report all ambiguities both when making the diff and applying the pa
tch.

      * As a warning when doing the diff

      * 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.

  







-- 

This mail was generated by DokuWiki at

http://wiki.metalforge.net/