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