Unexpected changes in PR

[nohwnd]

This is some bug, this is what I did:

$> darc update-subscription --id 1d630943-bfb5-4bf4-874a-b82bd6871c15 --channel "VS 18.5"
info: 'darc/production-c2d5bdff' branch doesn't exist. Creating it...
info: No configuration file path provided. Trying default location first...
info: Getting the contents of file 'configuration\subscriptions\dotnet-dotnet.yml' from repo 'dnceng/internal/maestro-configuration' in branch/commit 'darc/production-c2d5bdff'...
info: Committing 1 files to https://dev.azure.com/dnceng/internal/_git/maestro-configuration branch darc/production-c2d5bdff via API
info: Getting the contents of file 'configuration\subscriptions\dotnet-dotnet.yml' from repo 'dnceng/internal/maestro-configuration' in branch/commit 'darc/production-c2d5bdff'...
info: Successfully committed 1 files to https://dev.azure.com/dnceng/internal/_git/maestro-configuration branch darc/production-c2d5bdff
info: Creating pull request from darc/production-c2d5bdff to production...
info: Created pull request at https://dev.azure.com/dnceng/internal/_git/maestro-configuration/pullrequest/59043
info: The changes will take effect in Maestro shortly after the pull request is merged.

The PR affected multiple other repos.

https://dev.azure.com/dnceng/internal/_git/maestro-configuration/pullrequest/59043

[nohwnd]

Looks like the file is being re-ordered rather than the data being wrong, but that makes it very hard to see my desired change.

[adamzip]

Looks like the file is being re-ordered rather than the data being wrong, but that makes it very hard to see my desired change.

Yes, the new contents of the files are reordered after every change is made. It does make the git diff quite confusing unfortunately.

Maybe we could keep the ordering only in the exporter and disable it in the standard operations. I don't think anything would break as a result of that. Thoughts @dkurepa ?

[dkurepa]

Yes, the new contents of the files are reordered after every change is made. It does make the git diff quite confusing unfortunately.

this is not true, when an update is performed we shouldn't be reordering anything, we just update the model in the place where it is, so things might go up/down 1 line, but the order should remain the same.

Will have to try to reproduce this to see what's going on

[dkurepa]

Ah no you were right Adam, we do have a sort every time we update a subscription. The sorting order for subscriptions is:
- TargetBranch (main → master → release/* → internal/release/* → alphabetically)
- Channel (alphabetically)
- SourceRepository (alphabetically)
- Id (by GUID)

[dkurepa]

So the big diff in Jakubs PR happened because the order of the subscription changed because the channel was changed.
When we were designing this we thought it'd be a good idea to keep things organized like this, but maybe we shouldn't have, not sure..