-
Notifications
You must be signed in to change notification settings - Fork 231
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.
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
git subrepo pull (merge) lib/astc-encoder #537
git subrepo pull (merge) lib/astc-encoder #537
Conversation
subrepo: subdir: "lib/astc-encoder" merged: "adc637b0" upstream: origin: "https://github.com/ARM-software/astc-encoder.git" branch: "main" commit: "42a8f6ee" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo" commit: "2f68596"
lib/astc-encoder/.gitrepo
Outdated
@@ -6,7 +6,7 @@ | |||
[subrepo] | |||
remote = https://github.com/ARM-software/astc-encoder.git | |||
branch = main | |||
commit = e7cb1e453968b0e16e48ef6d68fc9d1227d8a378 | |||
commit = 42a8f6ee01715f45edffb6773e34b8bb914a47df | |||
parent = b87158d371723ba9670f5dc13e50a3e2a2799eba |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Change this to the correct parent of this subrepo pull
which is 2b1c072.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
done in 7b67ad9
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks fine but the parent in the .gitrepo file must be fixed. It still shows the parent of the previous subrepo pull
.
I just merged this and in doing so saw that a large number of files `astc-encoder/Test/Images///_results.csv have been added. Was this intentional. Why would test results be added to the repo? I also just tried another |
These were always there. Just upgraded due to a big change. These are reference scores, used for CI stuff. Pete has done a lot of changes recently. We could do another upgrade but its an active project. He said:
|
I'm still working on issues related to the Basis v1.16.1 pull so upgrading again will not delay the release. Let's do it as Pete recommends it. |
* git subrepo pull (merge) lib/astc-encoder subrepo: subdir: "lib/astc-encoder" merged: "adc637b0" upstream: origin: "https://github.com/ARM-software/astc-encoder.git" branch: "main" commit: "42a8f6ee" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo" commit: "2f68596" * Update gold images Co-authored-by: Wasim Abbas <abbas.wasim@gmail.com>
* git subrepo pull (merge) lib/astc-encoder subrepo: subdir: "lib/astc-encoder" merged: "adc637b0" upstream: origin: "https://github.com/ARM-software/astc-encoder.git" branch: "main" commit: "42a8f6ee" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo" commit: "2f68596" * Update gold images Co-authored-by: Wasim Abbas <abbas.wasim@gmail.com>
subrepo:
subdir: "lib/astc-encoder"
merged: "adc637b0"
upstream:
origin: "https://github.com/ARM-software/astc-encoder.git"
branch: "main"
commit: "42a8f6ee"
git-subrepo:
version: "0.4.3"
origin: "https://github.com/ingydotnet/git-subrepo"
commit: "2f68596"