equal
deleted
inserted
replaced
151 appl changeTabTo:((resources string: 'Merging with %1') bindWith: anHGChangeset id printString). |
151 appl changeTabTo:((resources string: 'Merging with %1') bindWith: anHGChangeset id printString). |
152 |
152 |
153 [ |
153 [ |
154 repo := self currentHgRepository. |
154 repo := self currentHgRepository. |
155 wc := repo workingCopy. |
155 wc := repo workingCopy. |
156 stream nextPutAll:(resources string: 'Mercurial > hg merge ') . anHGChangeset is printString. |
156 stream nextPutAll:(resources string: 'Mercurial > hg merge ') . anHGChangeset id printString. |
157 wc merge: anHGChangeset. |
157 wc merge: anHGChangeset. |
158 stream nextPutAll:(resources string: 'done'); cr. |
158 stream nextPutAll:(resources string: 'done'); cr. |
159 (wc conflicts asSortedCollection:[:a :b|a pathName < b pathName]) do:[:each| |
159 (wc conflicts asSortedCollection:[:a :b|a pathName < b pathName]) do:[:each| |
160 each isUnresolved ifTrue:[ |
160 each isUnresolved ifTrue:[ |
161 | merger | |
161 | merger | |
172 ]. |
172 ]. |
173 stream nextPutAll:(resources string: 'Merge finisged.') |
173 stream nextPutAll:(resources string: 'Merge finisged.') |
174 ] forkAt: Processor userBackgroundPriority |
174 ] forkAt: Processor userBackgroundPriority |
175 |
175 |
176 "Created: / 14-01-2013 / 21:59:58 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
176 "Created: / 14-01-2013 / 21:59:58 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
177 "Modified: / 13-03-2013 / 00:23:32 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
177 "Modified: / 18-03-2013 / 19:19:54 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
178 ! ! |
178 ! ! |
179 |
179 |
180 !AbstractFileBrowser methodsFor:'menu actions-scm-hg'! |
180 !AbstractFileBrowser methodsFor:'menu actions-scm-hg'! |
181 |
181 |
182 hgResolve |
182 hgResolve |