equal
deleted
inserted
replaced
1 "{ Encoding: utf8 }" |
|
2 |
|
3 " |
1 " |
4 COPYRIGHT (c) 2006 by eXept Software AG |
2 COPYRIGHT (c) 2006 by eXept Software AG |
5 All Rights Reserved |
3 All Rights Reserved |
6 |
4 |
7 This software is furnished under a license and may be used |
5 This software is furnished under a license and may be used |
308 ^ false |
306 ^ false |
309 ]. |
307 ]. |
310 ^ true. |
308 ^ true. |
311 ]. |
309 ]. |
312 |
310 |
313 self activityNotification:(resources string:'checking in %1' with:aClass name). |
311 self activityNotification:(resources string:'PerforceSourceCodeManager [info]: checking in %1' with:aClass name). |
314 pri := Processor activePriority. |
312 pri := Processor activePriority. |
315 Processor activeProcess withPriority:pri-1 to:pri |
313 Processor activeProcess withPriority:pri-1 to:pri |
316 do:[ |
314 do:[ |
317 |revision aborted| |
315 |revision aborted| |
318 |
316 |
1803 ]. |
1801 ]. |
1804 resultSource := repairedText asString string. |
1802 resultSource := repairedText asString string. |
1805 ]. |
1803 ]. |
1806 |
1804 |
1807 checkInRepaired ifTrue:[ |
1805 checkInRepaired ifTrue:[ |
1808 Transcript showCR:'checking in ' , pathName asFilename baseName , ' (manually repaired version) ...' |
1806 Transcript showCR:'PerforceSourceCodeManager [info]: checking in ' , pathName asFilename baseName , ' (manually repaired version) ...' |
1809 ] ifFalse:[ |
1807 ] ifFalse:[ |
1810 'PerforceSourceCodeManager [warning]: cannot (for now) checkin; conflicts found' infoPrintCR. |
1808 'PerforceSourceCodeManager [warning]: cannot (for now) checkin; conflicts found' infoPrintCR. |
1811 Transcript showCR:'checkin of ' , pathName asFilename baseName , ' aborted (conflicting changes; repository unchanged)'. |
1809 Transcript showCR:'checkin of ' , pathName asFilename baseName , ' aborted (conflicting changes; repository unchanged)'. |
1812 ^ nil. |
1810 ^ nil. |
1813 ] |
1811 ] |