SVN__WCActionConflict.st
author convert-repo
Tue, 09 Aug 2016 03:35:30 +0000
changeset 1178 3a6dad9479fd
parent 861 3f196b38f0e4
permissions -rw-r--r--
update tags
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
715
b0984579d361 Updates from SVN
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 415
diff changeset
     1
"
b0984579d361 Updates from SVN
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 415
diff changeset
     2
 Copyright (c) 2007-2010 Jan Vrany
b0984579d361 Updates from SVN
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 415
diff changeset
     3
 Copyright (c) 2009-2010 eXept Software AG
b0984579d361 Updates from SVN
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 415
diff changeset
     4
b0984579d361 Updates from SVN
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 415
diff changeset
     5
 Permission is hereby granted, free of charge, to any person
b0984579d361 Updates from SVN
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 415
diff changeset
     6
 obtaining a copy of this software and associated documentation
b0984579d361 Updates from SVN
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 415
diff changeset
     7
 files (the 'Software'), to deal in the Software without
b0984579d361 Updates from SVN
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 415
diff changeset
     8
 restriction, including without limitation the rights to use,
b0984579d361 Updates from SVN
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 415
diff changeset
     9
 copy, modify, merge, publish, distribute, sublicense, and/or sell
b0984579d361 Updates from SVN
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 415
diff changeset
    10
 copies of the Software, and to permit persons to whom the
b0984579d361 Updates from SVN
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 415
diff changeset
    11
 Software is furnished to do so, subject to the following
b0984579d361 Updates from SVN
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 415
diff changeset
    12
 conditions:
b0984579d361 Updates from SVN
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 415
diff changeset
    13
b0984579d361 Updates from SVN
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 415
diff changeset
    14
 The above copyright notice and this permission notice shall be
b0984579d361 Updates from SVN
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 415
diff changeset
    15
 included in all copies or substantial portions of the Software.
b0984579d361 Updates from SVN
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 415
diff changeset
    16
b0984579d361 Updates from SVN
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 415
diff changeset
    17
 THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
b0984579d361 Updates from SVN
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 415
diff changeset
    18
 EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
b0984579d361 Updates from SVN
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 415
diff changeset
    19
 OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
b0984579d361 Updates from SVN
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 415
diff changeset
    20
 NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
b0984579d361 Updates from SVN
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 415
diff changeset
    21
 HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
b0984579d361 Updates from SVN
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 415
diff changeset
    22
 WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
b0984579d361 Updates from SVN
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 415
diff changeset
    23
 FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
b0984579d361 Updates from SVN
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 415
diff changeset
    24
 OTHER DEALINGS IN THE SOFTWARE.
b0984579d361 Updates from SVN
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 415
diff changeset
    25
"
415
f5ea11089ec2 *** empty log message ***
fm
parents: 299
diff changeset
    26
"{ Package: 'stx:libsvn' }"
21
2f2502ed2842 initial checkin
fm
parents:
diff changeset
    27
2f2502ed2842 initial checkin
fm
parents:
diff changeset
    28
"{ NameSpace: SVN }"
2f2502ed2842 initial checkin
fm
parents:
diff changeset
    29
2f2502ed2842 initial checkin
fm
parents:
diff changeset
    30
WCAction subclass:#WCActionConflict
2f2502ed2842 initial checkin
fm
parents:
diff changeset
    31
	instanceVariableNames:''
2f2502ed2842 initial checkin
fm
parents:
diff changeset
    32
	classVariableNames:''
2f2502ed2842 initial checkin
fm
parents:
diff changeset
    33
	poolDictionaries:''
2f2502ed2842 initial checkin
fm
parents:
diff changeset
    34
	category:'SVN-Working copy'
2f2502ed2842 initial checkin
fm
parents:
diff changeset
    35
!
2f2502ed2842 initial checkin
fm
parents:
diff changeset
    36
715
b0984579d361 Updates from SVN
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 415
diff changeset
    37
!WCActionConflict class methodsFor:'documentation'!
b0984579d361 Updates from SVN
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 415
diff changeset
    38
b0984579d361 Updates from SVN
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 415
diff changeset
    39
copyright
b0984579d361 Updates from SVN
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 415
diff changeset
    40
"
b0984579d361 Updates from SVN
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 415
diff changeset
    41
 Copyright (c) 2007-2010 Jan Vrany
b0984579d361 Updates from SVN
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 415
diff changeset
    42
 Copyright (c) 2009-2010 eXept Software AG
b0984579d361 Updates from SVN
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 415
diff changeset
    43
b0984579d361 Updates from SVN
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 415
diff changeset
    44
 Permission is hereby granted, free of charge, to any person
b0984579d361 Updates from SVN
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 415
diff changeset
    45
 obtaining a copy of this software and associated documentation
b0984579d361 Updates from SVN
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 415
diff changeset
    46
 files (the 'Software'), to deal in the Software without
b0984579d361 Updates from SVN
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 415
diff changeset
    47
 restriction, including without limitation the rights to use,
b0984579d361 Updates from SVN
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 415
diff changeset
    48
 copy, modify, merge, publish, distribute, sublicense, and/or sell
b0984579d361 Updates from SVN
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 415
diff changeset
    49
 copies of the Software, and to permit persons to whom the
b0984579d361 Updates from SVN
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 415
diff changeset
    50
 Software is furnished to do so, subject to the following
b0984579d361 Updates from SVN
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 415
diff changeset
    51
 conditions:
b0984579d361 Updates from SVN
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 415
diff changeset
    52
b0984579d361 Updates from SVN
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 415
diff changeset
    53
 The above copyright notice and this permission notice shall be
b0984579d361 Updates from SVN
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 415
diff changeset
    54
 included in all copies or substantial portions of the Software.
b0984579d361 Updates from SVN
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 415
diff changeset
    55
b0984579d361 Updates from SVN
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 415
diff changeset
    56
 THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
b0984579d361 Updates from SVN
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 415
diff changeset
    57
 EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
b0984579d361 Updates from SVN
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 415
diff changeset
    58
 OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
b0984579d361 Updates from SVN
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 415
diff changeset
    59
 NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
b0984579d361 Updates from SVN
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 415
diff changeset
    60
 HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
b0984579d361 Updates from SVN
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 415
diff changeset
    61
 WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
b0984579d361 Updates from SVN
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 415
diff changeset
    62
 FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
b0984579d361 Updates from SVN
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 415
diff changeset
    63
 OTHER DEALINGS IN THE SOFTWARE.
b0984579d361 Updates from SVN
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 415
diff changeset
    64
b0984579d361 Updates from SVN
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 415
diff changeset
    65
"
b0984579d361 Updates from SVN
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 415
diff changeset
    66
! !
21
2f2502ed2842 initial checkin
fm
parents:
diff changeset
    67
2f2502ed2842 initial checkin
fm
parents:
diff changeset
    68
!WCActionConflict class methodsFor:'accessing'!
2f2502ed2842 initial checkin
fm
parents:
diff changeset
    69
2f2502ed2842 initial checkin
fm
parents:
diff changeset
    70
actionName
2f2502ed2842 initial checkin
fm
parents:
diff changeset
    71
    "Superclass says that I am responsible to implement this method"
2f2502ed2842 initial checkin
fm
parents:
diff changeset
    72
2f2502ed2842 initial checkin
fm
parents:
diff changeset
    73
    ^'C'
2f2502ed2842 initial checkin
fm
parents:
diff changeset
    74
2f2502ed2842 initial checkin
fm
parents:
diff changeset
    75
    "Created: / 16-03-2008 / 08:49:10 / janfrog"
715
b0984579d361 Updates from SVN
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 415
diff changeset
    76
    "Modified: / 02-11-2009 / 17:24:16 / Jan Vrany <jan.vrany@fit.cvut.cz>"
b0984579d361 Updates from SVN
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 415
diff changeset
    77
! !
b0984579d361 Updates from SVN
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 415
diff changeset
    78
b0984579d361 Updates from SVN
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 415
diff changeset
    79
!WCActionConflict class methodsFor:'others'!
b0984579d361 Updates from SVN
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 415
diff changeset
    80
b0984579d361 Updates from SVN
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 415
diff changeset
    81
version_CVS
861
3f196b38f0e4 checkin to get version methods correct
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 715
diff changeset
    82
    ^ '$Header$'
21
2f2502ed2842 initial checkin
fm
parents:
diff changeset
    83
! !
2f2502ed2842 initial checkin
fm
parents:
diff changeset
    84
2f2502ed2842 initial checkin
fm
parents:
diff changeset
    85
!WCActionConflict methodsFor:'processing'!
2f2502ed2842 initial checkin
fm
parents:
diff changeset
    86
2f2502ed2842 initial checkin
fm
parents:
diff changeset
    87
processEntry: entry using: processor 
2f2502ed2842 initial checkin
fm
parents:
diff changeset
    88
    "
2f2502ed2842 initial checkin
fm
parents:
diff changeset
    89
             Double dispath to a processor, passing an entry"
2f2502ed2842 initial checkin
fm
parents:
diff changeset
    90
    
2f2502ed2842 initial checkin
fm
parents:
diff changeset
    91
    ^ processor processConflictEntry: entry
2f2502ed2842 initial checkin
fm
parents:
diff changeset
    92
2f2502ed2842 initial checkin
fm
parents:
diff changeset
    93
    "Modified: / 27-08-2009 / 08:50:41 / Jan Vrany <jan.vrany@fit.cvut.cz>"
2f2502ed2842 initial checkin
fm
parents:
diff changeset
    94
! !
2f2502ed2842 initial checkin
fm
parents:
diff changeset
    95
2f2502ed2842 initial checkin
fm
parents:
diff changeset
    96
!WCActionConflict methodsFor:'testing'!
2f2502ed2842 initial checkin
fm
parents:
diff changeset
    97
2f2502ed2842 initial checkin
fm
parents:
diff changeset
    98
isConflict
2f2502ed2842 initial checkin
fm
parents:
diff changeset
    99
2f2502ed2842 initial checkin
fm
parents:
diff changeset
   100
    ^true
2f2502ed2842 initial checkin
fm
parents:
diff changeset
   101
2f2502ed2842 initial checkin
fm
parents:
diff changeset
   102
    "Created: / 17-08-2009 / 19:47:01 / Jan Vrany <vranyj1@fel.cvut.cz>"
2f2502ed2842 initial checkin
fm
parents:
diff changeset
   103
! !
2f2502ed2842 initial checkin
fm
parents:
diff changeset
   104
2f2502ed2842 initial checkin
fm
parents:
diff changeset
   105
!WCActionConflict class methodsFor:'documentation'!
2f2502ed2842 initial checkin
fm
parents:
diff changeset
   106
2f2502ed2842 initial checkin
fm
parents:
diff changeset
   107
version
861
3f196b38f0e4 checkin to get version methods correct
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 715
diff changeset
   108
    ^ '$Header$'
152
9464219bfe2f changed: #version_SVN
fm
parents: 21
diff changeset
   109
!
9464219bfe2f changed: #version_SVN
fm
parents: 21
diff changeset
   110
9464219bfe2f changed: #version_SVN
fm
parents: 21
diff changeset
   111
version_SVN
861
3f196b38f0e4 checkin to get version methods correct
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 715
diff changeset
   112
    ^ '§Id: SVN__WCActionConflict.st 363 2011-08-08 13:49:48Z vranyj1 §'
21
2f2502ed2842 initial checkin
fm
parents:
diff changeset
   113
! !