equal
deleted
inserted
replaced
1836 or:[changeLog isNil |
1836 or:[changeLog isNil |
1837 or:[(changeLog at:#revisions ifAbsent:[#()]) isEmpty]]) ifTrue:[ |
1837 or:[(changeLog at:#revisions ifAbsent:[#()]) isEmpty]]) ifTrue:[ |
1838 "/ |
1838 "/ |
1839 "/ pretty good - nothing has changed in the meanwhile |
1839 "/ pretty good - nothing has changed in the meanwhile |
1840 "/ |
1840 "/ |
1841 Transcript showCR:'CVSSourceCodeManager [info]: checking in ' , containerFilename , ' ...' |
1841 Logger info:'checking in %1...' with:containerFilename |
1842 ] ifFalse:[ |
1842 ] ifFalse:[ |
1843 | mySource mergedSource | |
1843 | mySource mergedSource | |
1844 |
1844 |
1845 "/ |
1845 "/ |
1846 "/ someone else has changed things in the meanwhile, but there is no conflict |
1846 "/ someone else has changed things in the meanwhile, but there is no conflict |
1917 "/Continue ?'. |
1917 "/Continue ?'. |
1918 "/ (self confirm:msg) ifFalse:[ |
1918 "/ (self confirm:msg) ifFalse:[ |
1919 "/ Transcript showCR:'checkin aborted - (no merge; repository unchanged)'. |
1919 "/ Transcript showCR:'checkin aborted - (no merge; repository unchanged)'. |
1920 "/ ^ false. |
1920 "/ ^ false. |
1921 "/ ]. |
1921 "/ ]. |
1922 Transcript showCR:'CVSSourceCodeManager [info]: checking in ' , containerFilename , ' (merged other changes) ...' |
1922 Logger info:'checking in %1 (merged other changes)...' with:containerFilename |
1923 ] |
1923 ] |
1924 ] ifFalse:[ |
1924 ] ifFalse:[ |
1925 (whatHappened startsWith:'C ') ifTrue:[ |
1925 (whatHappened startsWith:'C ') ifTrue:[ |
1926 "/ |
1926 "/ |
1927 "/ conflict; someone else checked in something in the meanwhile, |
1927 "/ conflict; someone else checked in something in the meanwhile, |
2032 ]. |
2032 ]. |
2033 ] |
2033 ] |
2034 ]. |
2034 ]. |
2035 |
2035 |
2036 checkInRepaired ifTrue:[ |
2036 checkInRepaired ifTrue:[ |
2037 Transcript showCR:'CVSSourceCodeManager [info]: checking in ' , containerFilename , ' (manually repaired version) ...' |
2037 Logger info:'checking in %1 (manually repaired version)...' with:containerFilename |
2038 ] ifFalse:[ |
2038 ] ifFalse:[ |
2039 'CVSSourceCodeManager [warning]: cannot (for now) checkin; conflicts found' infoPrintCR. |
2039 'CVSSourceCodeManager [warning]: cannot (for now) checkin; conflicts found' infoPrintCR. |
2040 Transcript showCR:'checkin of ' , containerFilename , ' aborted (conflicting changes; repository unchanged)'. |
2040 Logger warning:'checkin of %1 aborted (conflicting changes; repository unchanged)' with:containerFilename. |
2041 ^ false. |
2041 ^ false. |
2042 ] |
2042 ] |
2043 ] ifFalse:[ |
2043 ] ifFalse:[ |
2044 (whatHappened startsWith:'U ') ifTrue:[ |
2044 (whatHappened startsWith:'U ') ifTrue:[ |
2045 "/ |
2045 "/ |
2448 or:[changeLog isNil |
2448 or:[changeLog isNil |
2449 or:[(changeLog at:#revisions ifAbsent:nil) isEmptyOrNil]]) ifTrue:[ |
2449 or:[(changeLog at:#revisions ifAbsent:nil) isEmptyOrNil]]) ifTrue:[ |
2450 "/ |
2450 "/ |
2451 "/ pretty good - nothing has changed in the meanwhile |
2451 "/ pretty good - nothing has changed in the meanwhile |
2452 "/ |
2452 "/ |
2453 Transcript showCR:('CVSSourceCodeManager [info]: checking in %1 (%2)...' bindWith:className with:modulePath). |
2453 Logger info:'checking in %1 (%2)...' with:className with:modulePath. |
2454 ] ifFalse:[ |
2454 ] ifFalse:[ |
2455 |mySource mergedSource | |
2455 |mySource mergedSource | |
2456 |
2456 |
2457 "/ |
2457 "/ |
2458 "/ someone else has changed things in the meanwhile, but there is no conflict |
2458 "/ someone else has changed things in the meanwhile, but there is no conflict |
2543 "/Continue ?'. |
2543 "/Continue ?'. |
2544 "/ (self confirm:msg) ifFalse:[ |
2544 "/ (self confirm:msg) ifFalse:[ |
2545 "/ Transcript showCR:'checkin aborted - (no merge; repository unchanged)'. |
2545 "/ Transcript showCR:'checkin aborted - (no merge; repository unchanged)'. |
2546 "/ ^ false. |
2546 "/ ^ false. |
2547 "/ ]. |
2547 "/ ]. |
2548 Transcript showCR:('CVSSourceCodeManager [info]: checking in %1 (%2) (merge)...' bindWith:className with:modulePath). |
2548 Logger info:'checking in %1 (%2) (merge)...' with:className with:modulePath. |
2549 ] |
2549 ] |
2550 ] ifFalse:[ |
2550 ] ifFalse:[ |
2551 (whatHappened startsWith:'C ') ifTrue:[ |
2551 (whatHappened startsWith:'C ') ifTrue:[ |
2552 "/ |
2552 "/ |
2553 "/ conflict; someone else checked in something in the meanwhile, |
2553 "/ conflict; someone else checked in something in the meanwhile, |
2688 ]. |
2688 ]. |
2689 ]. |
2689 ]. |
2690 |
2690 |
2691 checkInRepaired ifTrue:[ |
2691 checkInRepaired ifTrue:[ |
2692 checkInNew ifTrue:[ |
2692 checkInNew ifTrue:[ |
2693 Transcript showCR:('CVSSourceCodeManager [info]: checking in %1 (%2) (force)...' bindWith:className with:modulePath). |
2693 Logger info:'checking in %1 (%2) (force)...' with:className with:modulePath. |
2694 ] ifFalse:[ |
2694 ] ifFalse:[ |
2695 conflictResolvedManually := true. "/ checkInRepaired and:[checkInNew not]. |
2695 conflictResolvedManually := true. "/ checkInRepaired and:[checkInNew not]. |
2696 Transcript showCR:('CVSSourceCodeManager [info]: checking in %1 (%2) (manually repaired)...' bindWith:className with:modulePath). |
2696 Logger info:'checking in %1 (%2) (manually repaired)...' with:className with:modulePath. |
2697 ]. |
2697 ]. |
2698 ] ifFalse:[ |
2698 ] ifFalse:[ |
2699 Transcript showCR:'checkin of ' , className , ' aborted (conflicting changes; repository unchanged)'. |
2699 Logger warning:'checkin of %1 aborted (conflicting changes; repository unchanged)' with:className. |
2700 self reportError:'checkin of ' , className , ' aborted (conflicting changes; repository unchanged)'. |
2700 self reportError:'checkin of ' , className , ' aborted (conflicting changes; repository unchanged)'. |
2701 ^ false. |
2701 ^ false. |
2702 ]. |
2702 ]. |
2703 ] ifFalse:[ |
2703 ] ifFalse:[ |
2704 ((whatHappened startsWith:'U ') |
2704 ((whatHappened startsWith:'U ') |