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