Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Sync eng/common directory with azure-sdk-tools for PR 7385 #22112

Merged
merged 12 commits into from
Dec 6, 2023
Merged

Sync eng/common directory with azure-sdk-tools for PR 7385 #22112

merged 12 commits into from
Dec 6, 2023

Commits on Dec 6, 2023

  1. Almost finished with the normal merge. Need to add conflict resolutio… 

    …n, continuation from a conflict resolution, and documentation updates
    @scbedd @azure-sdk
    scbedd authored and azure-sdk committed Dec 6, 2023
    Configuration menu
    Copy the full SHA
    886d718 View commit details
    Browse the repository at this point in the history

  2. swapped the concept over to something that works in place. It's much … 

    …much less wonky to do it this way, versus totally separating it from the proxy
    @scbedd @azure-sdk
    scbedd authored and azure-sdk committed Dec 6, 2023
    Configuration menu
    Copy the full SHA
    6988733 View commit details
    Browse the repository at this point in the history

  3. now we just need to cherry-pick and handle conflicts + resume

    @scbedd @azure-sdk
    scbedd authored and azure-sdk committed Dec 6, 2023
    Configuration menu
    Copy the full SHA
    df8cd29 View commit details
    Browse the repository at this point in the history

  4. only thing remaining is testing graceful conflict resolution

    @scbedd @azure-sdk
    scbedd authored and azure-sdk committed Dec 6, 2023
    Configuration menu
    Copy the full SHA
    092d2d8 View commit details
    Browse the repository at this point in the history

  5. allow resumption of cherry-picking after fixing a conflict!

    @scbedd @azure-sdk
    scbedd authored and azure-sdk committed Dec 6, 2023
    Configuration menu
    Copy the full SHA
    67294c7 View commit details
    Browse the repository at this point in the history

  6. handle resuming after pause for reconciliation

    @scbedd @azure-sdk
    scbedd authored and azure-sdk committed Dec 6, 2023
    Configuration menu
    Copy the full SHA
    8dff574 View commit details
    Browse the repository at this point in the history

  7. conflict resolution. adding some messaging so that users can actually… 

    … SEE the failure
    @scbedd @azure-sdk
    scbedd authored and azure-sdk committed Dec 6, 2023
    Configuration menu
    Copy the full SHA
    92cc742 View commit details
    Browse the repository at this point in the history

  8. documentation update. now handling the conflict resolution a bit more… 

    … smartly
    @scbedd @azure-sdk
    scbedd authored and azure-sdk committed Dec 6, 2023
    Configuration menu
    Copy the full SHA
    f1ff7d1 View commit details
    Browse the repository at this point in the history

  9. lots more detail in docs. handling the conflict modes

    @scbedd @azure-sdk
    scbedd authored and azure-sdk committed Dec 6, 2023
    Configuration menu
    Copy the full SHA
    a7b3d78 View commit details
    Browse the repository at this point in the history

  10. update spacing and comment text

    @scbedd @azure-sdk
    scbedd authored and azure-sdk committed Dec 6, 2023
    Configuration menu
    Copy the full SHA
    9b926c8 View commit details
    Browse the repository at this point in the history

  11. update $CommandArgs to $CommandString to better reflect what it actua… 

    …lly is
    @scbedd @azure-sdk
    scbedd authored and azure-sdk committed Dec 6, 2023
    Configuration menu
    Copy the full SHA
    2857687 View commit details
    Browse the repository at this point in the history

  12. whoops! didn't update the path to the target_version.txt.

    @scbedd @azure-sdk
    scbedd authored and azure-sdk committed Dec 6, 2023
    Configuration menu
    Copy the full SHA
    02e14cf View commit details
    Browse the repository at this point in the history