equal
deleted
inserted
replaced
177 |
177 |
178 merge |
178 merge |
179 "Runs a merge on file. Return true, if file conflicts had been |
179 "Runs a merge on file. Return true, if file conflicts had been |
180 resolved, false otherwise" |
180 resolved, false otherwise" |
181 |
181 |
182 ^HGCommand resolve |
182 ^file workingCopy repository execute: |
183 workingDirectory: file directory pathName; |
183 (HGCommand resolve |
184 files: (Array with: file baseName); |
184 workingDirectory: file directory pathName; |
185 execute |
185 files: (Array with: file baseName); |
186 |
186 yourself) |
187 "Modified: / 14-01-2013 / 20:57:13 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
187 |
|
188 "Modified: / 03-03-2013 / 23:06:36 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
188 ! ! |
189 ! ! |
189 |
190 |
190 !HGMergeTool::Smalltalk class methodsFor:'documentation'! |
191 !HGMergeTool::Smalltalk class methodsFor:'documentation'! |
191 |
192 |
192 documentation |
193 documentation |
234 Note that calling #merge is always safe. |
235 Note that calling #merge is always safe. |
235 " |
236 " |
236 |
237 |
237 | dinfo merged | |
238 | dinfo merged | |
238 |
239 |
239 HGCommand resolve |
240 file workingCopy repository execute: |
240 workingDirectory: file directory pathName; |
241 (HGCommand resolve |
241 tool: 'internal:dump'; |
242 workingDirectory: file directory pathName; |
242 files: (Array with: file baseName); |
243 tool: 'internal:dump'; |
243 execute. |
244 files: (Array with: file baseName); |
|
245 yourself). |
244 |
246 |
245 dinfo := self changesetDiffInfo. |
247 dinfo := self changesetDiffInfo. |
246 dinfo read. |
248 dinfo read. |
247 |
249 |
248 ^dinfo diffset isMerged ifTrue:[ |
250 ^dinfo diffset isMerged ifTrue:[ |
253 ] ifFalse:[ |
255 ] ifFalse:[ |
254 false |
256 false |
255 ] |
257 ] |
256 |
258 |
257 "Created: / 14-01-2013 / 21:15:49 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
259 "Created: / 14-01-2013 / 21:15:49 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
260 "Modified: / 03-03-2013 / 23:07:19 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
258 ! ! |
261 ! ! |
259 |
262 |
260 !HGMergeTool::Smalltalk methodsFor:'private'! |
263 !HGMergeTool::Smalltalk methodsFor:'private'! |
261 |
264 |
262 changesetDiffInfo |
265 changesetDiffInfo |