|
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 " |
1 "{ Package: 'stx:libsvn' }" |
26 "{ Package: 'stx:libsvn' }" |
2 |
27 |
3 "{ NameSpace: SVN }" |
28 "{ NameSpace: SVN }" |
4 |
29 |
5 WCAction subclass:#WCActionMerged |
30 WCAction subclass:#WCActionMerged |
7 classVariableNames:'' |
32 classVariableNames:'' |
8 poolDictionaries:'' |
33 poolDictionaries:'' |
9 category:'SVN-Working copy' |
34 category:'SVN-Working copy' |
10 ! |
35 ! |
11 |
36 |
|
37 !WCActionMerged 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 ! ! |
12 |
67 |
13 !WCActionMerged class methodsFor:'accessing'! |
68 !WCActionMerged class methodsFor:'accessing'! |
14 |
69 |
15 actionName |
70 actionName |
16 "Superclass says that I am responsible to implement this method" |
71 "Superclass says that I am responsible to implement this method" |
17 |
72 |
18 ^'G' |
73 ^'G' |
19 |
74 |
20 "Created: / 16-03-2008 / 08:49:10 / janfrog" |
75 "Created: / 16-03-2008 / 08:49:10 / janfrog" |
|
76 ! ! |
|
77 |
|
78 !WCActionMerged class methodsFor:'others'! |
|
79 |
|
80 version_CVS |
|
81 ^ '$ÂHeader: /cvs/stx/stx/libsvn/SVN__WCActionMerged.st,v 1.4 2009/10/19 12:22:43 fm Exp Â$' |
21 ! ! |
82 ! ! |
22 |
83 |
23 !WCActionMerged methodsFor:'processing'! |
84 !WCActionMerged methodsFor:'processing'! |
24 |
85 |
25 processEntry: entry using: processor |
86 processEntry: entry using: processor |