Changes between Version 6 and Version 7 of EmacsInterface/Undo

Timestamp:

May 25, 2012, 2:41:13 PM (14 years ago)

Author:

manualwiki

Comment:

--

EmacsInterface/Undo

@@ -37 +37 @@
 conflicts with newer changes after that, similarly to the simple case at refactoring conflicts.
 
+==== Examples of behaviour ====
+We give two examples, for showing the behaviour of the merging
+algorithm of the conflicts.
 
+Example 1. (see picture: Example 1 - Merge)
+
+1. we move the ''pzip'' function from module ''from'' to
+ module ''xlists''
+2. we edit the module ''xlists'' after refactoring in area, that
+ is not affected by refactoring (''flatsort'')
+3. then we undo the refactoring in the module ''from'': merge is
+ successful, the edited text is unchanged
+
+Example 2. (see picture: Example 2- Conflict)
+
+1. we move the ''pzip'' function from module ''from'' to module ''xlists''
+2. item we edit the module {\em xlists} after refactoring in area, that is affected 
+by refactoring (''pzip'')
+3. then we undo the refactoring in the module ''from'': conflict arises, the change by editing is rejected
+