Mercurial Mercurial > hg > stx-libtool / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
oops - merge output is different than expected sometimes
authorClaus Gittinger <cg@exept.de>
Wed, 13 Dec 1995 20:03:36 +0100
changeset 290 5b9361cfa7b8
parent 289 a6133415c545
child 291 c7f0dd4247d3
oops - merge output is different than expected sometimes
Diff3TextView.st file | annotate | diff | comparison | revisions
Diff3TxtV.st file | annotate | diff | comparison | revisions 
--- a/Diff3TextView.st	Wed Dec 13 17:53:04 1995 +0100
+++ b/Diff3TextView.st	Wed Dec 13 20:03:36 1995 +0100
@@ -185,7 +185,12 @@
                     state := 2. skip := true.
                 ] ifFalse:[
                     (entry startsWith:'=======') ifTrue:[
-                        state := 3. skip := true.
+                        state == 2 ifFalse:[
+                            state := 23        "/ on both 2 and 3
+                        ] ifTrue:[
+                            state := 3         "/ only in 3
+                        ].
+                        skip := true.
                     ] ifFalse:[
                         (entry startsWith:'>>>>>>>') ifTrue:[
                             state := #initial.
@@ -203,15 +208,15 @@
                         l1 add:entry
                     ]
                 ].
-                (state == #initial or:[state == 2]) ifTrue:[
-                    (useColors and:[state == 2]) ifTrue:[
+                (state == #initial or:[state == 2 or:[state == 23]]) ifTrue:[
+                    (useColors and:[state == 2 or:[state == 23]]) ifTrue:[
                         l2 add:(ColoredListEntry string:entry foregroundColor:changedColor backgroundColor:changedBgColor).
                     ] ifFalse:[
                         l2 add:entry
                     ]
                 ].
-                (state == #initial or:[state == 3]) ifTrue:[
-                    (useColors and:[state == 3]) ifTrue:[
+                (state == #initial or:[state == 3 or:[state == 23]]) ifTrue:[
+                    (useColors and:[state == 3 or:[state == 23]]) ifTrue:[
                         l3 add:(ColoredListEntry string:entry foregroundColor:changedColor backgroundColor:changedBgColor).
                     ] ifFalse:[
                         l3 add:entry
@@ -225,11 +230,11 @@
     textView2 list:l2.
     textView3 list:l3.
 
-    "Modified: 12.12.1995 / 13:16:08 / cg"
+    "Modified: 13.12.1995 / 19:56:32 / cg"
 ! !
 
 !Diff3TextView class methodsFor:'documentation'!
 
 version
-^ '$Header: /cvs/stx/stx/libtool/Diff3TextView.st,v 1.2 1995-12-12 13:47:12 cg Exp $'
+^ '$Header: /cvs/stx/stx/libtool/Diff3TextView.st,v 1.3 1995-12-13 19:03:36 cg Exp $'
 ! !
--- a/Diff3TxtV.st	Wed Dec 13 17:53:04 1995 +0100
+++ b/Diff3TxtV.st	Wed Dec 13 20:03:36 1995 +0100
@@ -185,7 +185,12 @@
                     state := 2. skip := true.
                 ] ifFalse:[
                     (entry startsWith:'=======') ifTrue:[
-                        state := 3. skip := true.
+                        state == 2 ifFalse:[
+                            state := 23        "/ on both 2 and 3
+                        ] ifTrue:[
+                            state := 3         "/ only in 3
+                        ].
+                        skip := true.
                     ] ifFalse:[
                         (entry startsWith:'>>>>>>>') ifTrue:[
                             state := #initial.
@@ -203,15 +208,15 @@
                         l1 add:entry
                     ]
                 ].
-                (state == #initial or:[state == 2]) ifTrue:[
-                    (useColors and:[state == 2]) ifTrue:[
+                (state == #initial or:[state == 2 or:[state == 23]]) ifTrue:[
+                    (useColors and:[state == 2 or:[state == 23]]) ifTrue:[
                         l2 add:(ColoredListEntry string:entry foregroundColor:changedColor backgroundColor:changedBgColor).
                     ] ifFalse:[
                         l2 add:entry
                     ]
                 ].
-                (state == #initial or:[state == 3]) ifTrue:[
-                    (useColors and:[state == 3]) ifTrue:[
+                (state == #initial or:[state == 3 or:[state == 23]]) ifTrue:[
+                    (useColors and:[state == 3 or:[state == 23]]) ifTrue:[
                         l3 add:(ColoredListEntry string:entry foregroundColor:changedColor backgroundColor:changedBgColor).
                     ] ifFalse:[
                         l3 add:entry
@@ -225,11 +230,11 @@
     textView2 list:l2.
     textView3 list:l3.
 
-    "Modified: 12.12.1995 / 13:16:08 / cg"
+    "Modified: 13.12.1995 / 19:56:32 / cg"
 ! !
 
 !Diff3TextView class methodsFor:'documentation'!
 
 version
-^ '$Header: /cvs/stx/stx/libtool/Attic/Diff3TxtV.st,v 1.2 1995-12-12 13:47:12 cg Exp $'
+^ '$Header: /cvs/stx/stx/libtool/Attic/Diff3TxtV.st,v 1.3 1995-12-13 19:03:36 cg Exp $'
 ! !
hg/stx-libtool