Keep Target Branch Merge Strategy #77
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
ping (+1 squashed commit) Squashed commits: [cb9de41] pong (+1 squashed commit) Squashed commits: [8761d29] ping
…target branch merge driver test Squashed commits: [59348a7] pong
Squashed commits: [f8e692a] half-ping
pastey
approved these changes
Feb 13, 2024
| @@ -33,6 +33,10 @@ then | |||
| TESTS_TO_RUN=`ls case*.sh` | |||
| fi | |||
|
|
|||
| if [ ${#TESTS_TO_RUN[@]} -eq 1 ]; then | |||
| PARALLELIZE=0 | |||
There was a problem hiding this comment.
Таким чином, якщо ми запустили рівно один тест, в нас будуть виводитись логи від тесту. By default логи в паралельному режимі вимкнені, щоб не отримувати вінегрет з виводу декількох тестів.
| // Copyright © 2024 Readdle. All rights reserved. | ||
| // | ||
|
|
||
| #import "S7DefaultMergeStrategy.h" |
There was a problem hiding this comment.
Тут все один в один перенесене з MergeDriver. А там тепер є можливість перемикатися між стратегіями.
| @@ -469,8 +311,8 @@ - (S7ConflictResolutionOption)resolveConflictBetweenOurVersion:(S7SubrepoDescrip | |||
| " you can (m)erge, keep (l)ocal or keep (r)emote.\n" | |||
| " what do you want to do? ", | |||
| ourVersion.path.fileSystemRepresentation, | |||
| [ourVersion.humanReadableRevisionAndBranchState cStringUsingEncoding:NSUTF8StringEncoding], | |||
There was a problem hiding this comment.
Тепер тут окрім щось типу 1234affebd (main) може писатися ще й коментар до SubrepoDesc, якщо він є.
Реально ми коментар ставимо в одному кейсі в Keep Target Branch strategy, бо там є неочевидне перекидання імені бранчі з release на trunk. Тоді там виходить щось типу:
What do you want to do?
Dependencies/ReaddleLib 1234affebd (main) (Originally from release branch.)
...
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Add S7_MERGE_DRIVER_KEEP_TARGET_BRANCH to the merge driver