|
643
|
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 |
"
|
|
|
26 |
"{ Package: 'stx:libsvn' }"
|
|
|
27 |
|
|
|
28 |
"{ NameSpace: SVN }"
|
|
|
29 |
|
|
|
30 |
UpdateLikeCommand subclass:#MergeCommand
|
|
|
31 |
instanceVariableNames:'branchToMerge'
|
|
|
32 |
classVariableNames:''
|
|
|
33 |
poolDictionaries:''
|
|
|
34 |
category:'SVN-Private-Commands'
|
|
|
35 |
!
|
|
|
36 |
|
|
|
37 |
!MergeCommand 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 |
! !
|
|
|
67 |
|
|
|
68 |
!MergeCommand methodsFor:'accessing'!
|
|
|
69 |
|
|
|
70 |
branchToMerge
|
|
|
71 |
^ branchToMerge
|
|
|
72 |
!
|
|
|
73 |
|
|
|
74 |
branchToMerge:aBranch
|
|
|
75 |
branchToMerge := aBranch.
|
|
|
76 |
! !
|
|
|
77 |
|
|
|
78 |
!MergeCommand methodsFor:'executing'!
|
|
|
79 |
|
|
|
80 |
doPrepareWorkingCopy
|
|
|
81 |
self do:[
|
|
|
82 |
self workingCopy ensureIsValid.
|
|
|
83 |
self
|
|
|
84 |
doRevert;
|
|
|
85 |
doFileOutAll;
|
|
|
86 |
doUpdate;
|
|
|
87 |
doProcessNotifications
|
|
|
88 |
]
|
|
|
89 |
|
|
|
90 |
"Created: / 23-03-2009 / 18:35:06 / Jan Vrany <vranyj1@fel.cvut.cz>"
|
|
|
91 |
"Modified: / 17-08-2009 / 19:01:45 / Jan Vrany <vranyj1@fel.cvut.cz>"
|
|
|
92 |
! !
|
|
|
93 |
|
|
|
94 |
!MergeCommand methodsFor:'executing - private'!
|
|
|
95 |
|
|
|
96 |
svnCmd
|
|
|
97 |
"raise an error: must be redefined in concrete subclass(es)"
|
|
|
98 |
|
|
|
99 |
^'merge'
|
|
|
100 |
|
|
|
101 |
"Created: / 15-03-2008 / 23:48:44 / janfrog"
|
|
|
102 |
"Modified: / 22-11-2009 / 07:42:13 / Jan Vrany <jan.vrany@fit.cvut.cz>"
|
|
|
103 |
!
|
|
|
104 |
|
|
|
105 |
svnCmdArgumentsOn: arg
|
|
|
106 |
"raise an error: must be redefined in concrete subclass(es)"
|
|
|
107 |
|
|
|
108 |
"/super svnCmdArgumentsOn: arg.
|
|
|
109 |
arg
|
|
|
110 |
nextPut: branchToMerge url asString
|
|
|
111 |
|
|
|
112 |
"Created: / 15-03-2008 / 23:48:44 / janfrog"
|
|
|
113 |
"Modified: / 19-03-2008 / 12:44:01 / janfrog"
|
|
|
114 |
"Modified: / 23-11-2009 / 08:51:23 / Jan Vrany <jan.vrany@fit.cvut.cz>"
|
|
|
115 |
! !
|
|
|
116 |
|
|
|
117 |
!MergeCommand class methodsFor:'documentation'!
|
|
|
118 |
|
|
|
119 |
version
|
|
|
120 |
^ '$Header$'
|
|
|
121 |
!
|
|
|
122 |
|
|
|
123 |
version_CVS
|
|
|
124 |
^ '$Header$'
|
|
|
125 |
!
|
|
|
126 |
|
|
|
127 |
version_SVN
|
|
|
128 |
^ '§Id: SVN__MergeCommand.st 350 2011-07-07 18:42:56Z vranyj1 §'
|
|
|
129 |
! !
|