Issue sorted now, thanks to Ben Copeland.
Thomas
Den 2020-06-09 kl. 08:51, skrev Thomas Törnblom via TF-M:
> Still having this issue:
> ---
> PS C:\Users\thomasto\Projects\tf-m1\trusted-firmware-m> git push
> ssh://review.trustedfirmware.org/TF-M/trusted-firmware-m.git
> HEAD:refs/for/master
> Enumerating objects: 208, done.
> Counting objects: 100% (207/207), done.
> Delta compression using up to 4 threads
> Compressing objects: 100% (131/131), done.
> Writing objects: 100% (135/135), 16.94 KiB | 1.06 MiB/s, done.
> Total 135 (delta 97), reused 0 (delta 0), pack-reused 0
> remote: Resolving deltas: 100% (97/97)
> remote: Processing changes: refs: 1, done
> To ssh://review.trustedfirmware.org/TF-M/trusted-firmware-m.git
> ! [remote rejected] HEAD -> refs/for/master
> (I00fb896d2005eb9e64e5a6869e3d6e1d814d43a7 has duplicates)
> error: failed to push some refs to
> 'ssh://review.trustedfirmware.org/TF-M/trusted-firmware-m.git'
> ---
>
> Any ideas how to resolve?
>
> I guess starting out with a fresh local repo would work, but I have 11
> patches waiting to be reviewed and merged.
>
> A handful of them appears to be duplicated, and I abandoned those that
> appeared to be old and had merge conflicts. Unfortunately a majority
> of those had already been reviewed and the new ones aren't. The new
> ones has also lost their reviewers
>
> So now I'm stuck and I can't update or create new patches.
>
> Thomas
> --
>
> *Thomas Törnblom*, /Product Engineer/
> IAR Systems AB
> Box 23051, Strandbodgatan 1
> SE-750 23 Uppsala, SWEDEN
> Mobile: +46 76 180 17 80 Fax: +46 18 16 78 01
> E-mail: thomas.tornblom(a)iar.com <mailto:thomas.tornblom@iar.com>
> Website: www.iar.com <http://www.iar.com>
> Twitter: www.twitter.com/iarsystems <http://www.twitter.com/iarsystems>
>
--
*Thomas Törnblom*, /Product Engineer/
IAR Systems AB
Box 23051, Strandbodgatan 1
SE-750 23 Uppsala, SWEDEN
Mobile: +46 76 180 17 80 Fax: +46 18 16 78 01
E-mail: thomas.tornblom(a)iar.com <mailto:thomas.tornblom@iar.com>
Website: www.iar.com <http://www.iar.com>
Twitter: www.twitter.com/iarsystems <http://www.twitter.com/iarsystems>
Still having this issue:
---
PS C:\Users\thomasto\Projects\tf-m1\trusted-firmware-m> git push
ssh://review.trustedfirmware.org/TF-M/trusted-firmware-m.git
HEAD:refs/for/master
Enumerating objects: 208, done.
Counting objects: 100% (207/207), done.
Delta compression using up to 4 threads
Compressing objects: 100% (131/131), done.
Writing objects: 100% (135/135), 16.94 KiB | 1.06 MiB/s, done.
Total 135 (delta 97), reused 0 (delta 0), pack-reused 0
remote: Resolving deltas: 100% (97/97)
remote: Processing changes: refs: 1, done
To ssh://review.trustedfirmware.org/TF-M/trusted-firmware-m.git
! [remote rejected] HEAD -> refs/for/master
(I00fb896d2005eb9e64e5a6869e3d6e1d814d43a7 has duplicates)
error: failed to push some refs to
'ssh://review.trustedfirmware.org/TF-M/trusted-firmware-m.git'
---
Any ideas how to resolve?
I guess starting out with a fresh local repo would work, but I have 11
patches waiting to be reviewed and merged.
A handful of them appears to be duplicated, and I abandoned those that
appeared to be old and had merge conflicts. Unfortunately a majority of
those had already been reviewed and the new ones aren't. The new ones
has also lost their reviewers
So now I'm stuck and I can't update or create new patches.
Thomas
--
*Thomas Törnblom*, /Product Engineer/
IAR Systems AB
Box 23051, Strandbodgatan 1
SE-750 23 Uppsala, SWEDEN
Mobile: +46 76 180 17 80 Fax: +46 18 16 78 01
E-mail: thomas.tornblom(a)iar.com <mailto:thomas.tornblom@iar.com>
Website: www.iar.com <http://www.iar.com>
Twitter: www.twitter.com/iarsystems <http://www.twitter.com/iarsystems>
Also the dashboard has been updated for the project to point to new repo :
https://review.trustedfirmware.org/p/TF-M/trusted-firmware-m/+/dashboard/si…
Best Regards
Soby Mathew
From: TF-M <tf-m-bounces(a)lists.trustedfirmware.org> On Behalf Of Minos Galanakis via TF-M
Sent: 08 June 2020 17:11
To: tf-m(a)lists.trustedfirmware.org; Thomas Törnblom <thomas.tornblom(a)iar.com>
Cc: nd <nd(a)arm.com>
Subject: Re: [TF-M] TF-M URLs update for code and Gerrit review
Hi Thomas.
I have just prepared a patch which is updating the documentation with references to the new repository address.
https://review.trustedfirmware.org/c/TF-M/trusted-firmware-m/+/4487
Regards,
Minos
________________________________
From: TF-M <tf-m-bounces(a)lists.trustedfirmware.org<mailto:tf-m-bounces@lists.trustedfirmware.org>> on behalf of Thomas Törnblom via TF-M <tf-m(a)lists.trustedfirmware.org<mailto:tf-m@lists.trustedfirmware.org>>
Sent: 08 June 2020 13:17
To: tf-m(a)lists.trustedfirmware.org<mailto:tf-m@lists.trustedfirmware.org> <tf-m(a)lists.trustedfirmware.org<mailto:tf-m@lists.trustedfirmware.org>>
Subject: Re: [TF-M] TF-M URLs update for code and Gerrit review
.../docs/processes/contributing.rst should be updated with the new URL also.
I checked there when I started having issues, but saw no changes there.
Thomas
Den 2020-06-08 kl. 14:10, skrev Thomas Törnblom via TF-M:
Thanks Anton, that explains things.
However now I get some other issues:
---
PS C:\Users\thomasto\Projects\tf-m1\trusted-firmware-m> git push ssh://review.trustedfirmware.org/TF-M/trusted-firmware-m.git HEAD:refs/for/master
Enumerating objects: 208, done.
Counting objects: 100% (207/207), done.
Delta compression using up to 4 threads
Compressing objects: 100% (131/131), done.
Writing objects: 100% (135/135), 16.94 KiB | 1.06 MiB/s, done.
Total 135 (delta 97), reused 0 (delta 0), pack-reused 0
remote: Resolving deltas: 100% (97/97)
remote: Processing changes: refs: 1, done
To ssh://review.trustedfirmware.org/TF-M/trusted-firmware-m.git
! [remote rejected] HEAD -> refs/for/master (I00fb896d2005eb9e64e5a6869e3d6e1d814d43a7 has duplicates)
error: failed to push some refs to 'ssh://review.trustedfirmware.org/TF-M/trusted-firmware-m.git'
---
Thomas
Den 2020-06-08 kl. 13:43, skrev Anton Komlev via TF-M:
Hello
TF-M code moved to the new location recently with a redirection link from the original URL - for compatibility purpose.
Unfortunately, Gerrit got confused with two namespaces and several patches got messed up last week. To prevent it from happen again, the old TF-M location marked as read-only mirror.
Please use new TF-M URL for your pushing your commits:
ssh://<user-name>@review.trustedfirmware.org:29418/TF-M/trusted-firmware-m
New repo URL:
https://review.trustedfirmware.org/TF-M/trusted-firmware-m
Thanks,
Anton
--
Thomas Törnblom, Product Engineer
IAR Systems AB
Box 23051, Strandbodgatan 1
SE-750 23 Uppsala, SWEDEN
Mobile: +46 76 180 17 80 Fax: +46 18 16 78 01
E-mail: thomas.tornblom(a)iar.com<mailto:thomas.tornblom@iar.com> Website: www.iar.com<http://www.iar.com>
Twitter: www.twitter.com/iarsystems<http://www.twitter.com/iarsystems>
--
Thomas Törnblom, Product Engineer
IAR Systems AB
Box 23051, Strandbodgatan 1
SE-750 23 Uppsala, SWEDEN
Mobile: +46 76 180 17 80 Fax: +46 18 16 78 01
E-mail: thomas.tornblom(a)iar.com<mailto:thomas.tornblom@iar.com> Website: www.iar.com<http://www.iar.com>
Twitter: www.twitter.com/iarsystems<http://www.twitter.com/iarsystems>
Hi Thomas.
I have just prepared a patch which is updating the documentation with references to the new repository address.
https://review.trustedfirmware.org/c/TF-M/trusted-firmware-m/+/4487
Regards,
Minos
________________________________
From: TF-M <tf-m-bounces(a)lists.trustedfirmware.org> on behalf of Thomas Törnblom via TF-M <tf-m(a)lists.trustedfirmware.org>
Sent: 08 June 2020 13:17
To: tf-m(a)lists.trustedfirmware.org <tf-m(a)lists.trustedfirmware.org>
Subject: Re: [TF-M] TF-M URLs update for code and Gerrit review
.../docs/processes/contributing.rst should be updated with the new URL also.
I checked there when I started having issues, but saw no changes there.
Thomas
Den 2020-06-08 kl. 14:10, skrev Thomas Törnblom via TF-M:
Thanks Anton, that explains things.
However now I get some other issues:
---
PS C:\Users\thomasto\Projects\tf-m1\trusted-firmware-m> git push ssh://review.trustedfirmware.org/TF-M/trusted-firmware-m.git HEAD:refs/for/master
Enumerating objects: 208, done.
Counting objects: 100% (207/207), done.
Delta compression using up to 4 threads
Compressing objects: 100% (131/131), done.
Writing objects: 100% (135/135), 16.94 KiB | 1.06 MiB/s, done.
Total 135 (delta 97), reused 0 (delta 0), pack-reused 0
remote: Resolving deltas: 100% (97/97)
remote: Processing changes: refs: 1, done
To ssh://review.trustedfirmware.org/TF-M/trusted-firmware-m.git
! [remote rejected] HEAD -> refs/for/master (I00fb896d2005eb9e64e5a6869e3d6e1d814d43a7 has duplicates)
error: failed to push some refs to 'ssh://review.trustedfirmware.org/TF-M/trusted-firmware-m.git'
---
Thomas
Den 2020-06-08 kl. 13:43, skrev Anton Komlev via TF-M:
Hello
TF-M code moved to the new location recently with a redirection link from the original URL – for compatibility purpose.
Unfortunately, Gerrit got confused with two namespaces and several patches got messed up last week. To prevent it from happen again, the old TF-M location marked as read-only mirror.
Please use new TF-M URL for your pushing your commits:
ssh://<user-name>@review.trustedfirmware.org:29418/TF-M/trusted-firmware-m
New repo URL:
https://review.trustedfirmware.org/TF-M/trusted-firmware-m
Thanks,
Anton
--
Thomas Törnblom, Product Engineer
IAR Systems AB
Box 23051, Strandbodgatan 1
SE-750 23 Uppsala, SWEDEN
Mobile: +46 76 180 17 80 Fax: +46 18 16 78 01
E-mail: thomas.tornblom(a)iar.com<mailto:thomas.tornblom@iar.com> Website: www.iar.com<http://www.iar.com>
Twitter: www.twitter.com/iarsystems<http://www.twitter.com/iarsystems>
--
Thomas Törnblom, Product Engineer
IAR Systems AB
Box 23051, Strandbodgatan 1
SE-750 23 Uppsala, SWEDEN
Mobile: +46 76 180 17 80 Fax: +46 18 16 78 01
E-mail: thomas.tornblom(a)iar.com<mailto:thomas.tornblom@iar.com> Website: www.iar.com<http://www.iar.com>
Twitter: www.twitter.com/iarsystems<http://www.twitter.com/iarsystems>
Hi Anton,
That URL you provided doesn't work: "Not Found".
I presume you mean
https://git.trustedfirmware.org/TF-M/trusted-firmware-m.git/
and respectively
https://review.trustedfirmware.org/q/project:TF-M%252Ftrusted-firmware-m<https://review.trustedfirmware.org/q/project:TF-M%252Ftrusted-firmware-m+st…>
Adrian
________________________________
From: TF-M <tf-m-bounces(a)lists.trustedfirmware.org> on behalf of Anton Komlev via TF-M <tf-m(a)lists.trustedfirmware.org>
Sent: 08 June 2020 12:43
To: tf-m(a)lists.trustedfirmware.org <tf-m(a)lists.trustedfirmware.org>
Cc: nd <nd(a)arm.com>
Subject: [TF-M] TF-M URLs update for code and Gerrit review
Hello
TF-M code moved to the new location recently with a redirection link from the original URL – for compatibility purpose.
Unfortunately, Gerrit got confused with two namespaces and several patches got messed up last week. To prevent it from happen again, the old TF-M location marked as read-only mirror.
Please use new TF-M URL for your pushing your commits:
ssh://<user-name>@review.trustedfirmware.org:29418/TF-M/trusted-firmware-m
New repo URL:
https://review.trustedfirmware.org/TF-M/trusted-firmware-m
Thanks,
Anton
.../docs/processes/contributing.rst should be updated with the new URL also.
I checked there when I started having issues, but saw no changes there.
Thomas
Den 2020-06-08 kl. 14:10, skrev Thomas Törnblom via TF-M:
> Thanks Anton, that explains things.
>
> However now I get some other issues:
> ---
> PS C:\Users\thomasto\Projects\tf-m1\trusted-firmware-m> git push
> ssh://review.trustedfirmware.org/TF-M/trusted-firmware-m.git
> HEAD:refs/for/master
> Enumerating objects: 208, done.
> Counting objects: 100% (207/207), done.
> Delta compression using up to 4 threads
> Compressing objects: 100% (131/131), done.
> Writing objects: 100% (135/135), 16.94 KiB | 1.06 MiB/s, done.
> Total 135 (delta 97), reused 0 (delta 0), pack-reused 0
> remote: Resolving deltas: 100% (97/97)
> remote: Processing changes: refs: 1, done
> To ssh://review.trustedfirmware.org/TF-M/trusted-firmware-m.git
> ! [remote rejected] HEAD -> refs/for/master
> (I00fb896d2005eb9e64e5a6869e3d6e1d814d43a7 has duplicates)
> error: failed to push some refs to
> 'ssh://review.trustedfirmware.org/TF-M/trusted-firmware-m.git'
> ---
>
> Thomas
>
> Den 2020-06-08 kl. 13:43, skrev Anton Komlev via TF-M:
>>
>> Hello
>>
>> TF-M code moved to the new location recently with a redirection link
>> from the original URL – for compatibility purpose.
>>
>> Unfortunately, Gerrit got confused with two namespaces and several
>> patches got messed up last week. To prevent it from happen again, the
>> old TF-M location marked as read-only mirror.
>>
>> Please use new TF-M URL for your pushing your commits:
>>
>> ssh://<user-name>@review.trustedfirmware.org:29418/TF-M/trusted-firmware-m
>>
>> New repo URL:
>>
>> https://review.trustedfirmware.org/TF-M/trusted-firmware-m
>>
>> Thanks,
>>
>> Anton
>>
>>
>
> --
>
> *Thomas Törnblom*, /Product Engineer/
> IAR Systems AB
> Box 23051, Strandbodgatan 1
> SE-750 23 Uppsala, SWEDEN
> Mobile: +46 76 180 17 80 Fax: +46 18 16 78 01
> E-mail: thomas.tornblom(a)iar.com <mailto:thomas.tornblom@iar.com>
> Website: www.iar.com <http://www.iar.com>
> Twitter: www.twitter.com/iarsystems <http://www.twitter.com/iarsystems>
>
--
*Thomas Törnblom*, /Product Engineer/
IAR Systems AB
Box 23051, Strandbodgatan 1
SE-750 23 Uppsala, SWEDEN
Mobile: +46 76 180 17 80 Fax: +46 18 16 78 01
E-mail: thomas.tornblom(a)iar.com <mailto:thomas.tornblom@iar.com>
Website: www.iar.com <http://www.iar.com>
Twitter: www.twitter.com/iarsystems <http://www.twitter.com/iarsystems>
Thanks Anton, that explains things.
However now I get some other issues:
---
PS C:\Users\thomasto\Projects\tf-m1\trusted-firmware-m> git push
ssh://review.trustedfirmware.org/TF-M/trusted-firmware-m.git
HEAD:refs/for/master
Enumerating objects: 208, done.
Counting objects: 100% (207/207), done.
Delta compression using up to 4 threads
Compressing objects: 100% (131/131), done.
Writing objects: 100% (135/135), 16.94 KiB | 1.06 MiB/s, done.
Total 135 (delta 97), reused 0 (delta 0), pack-reused 0
remote: Resolving deltas: 100% (97/97)
remote: Processing changes: refs: 1, done
To ssh://review.trustedfirmware.org/TF-M/trusted-firmware-m.git
! [remote rejected] HEAD -> refs/for/master
(I00fb896d2005eb9e64e5a6869e3d6e1d814d43a7 has duplicates)
error: failed to push some refs to
'ssh://review.trustedfirmware.org/TF-M/trusted-firmware-m.git'
---
Thomas
Den 2020-06-08 kl. 13:43, skrev Anton Komlev via TF-M:
>
> Hello
>
> TF-M code moved to the new location recently with a redirection link
> from the original URL – for compatibility purpose.
>
> Unfortunately, Gerrit got confused with two namespaces and several
> patches got messed up last week. To prevent it from happen again, the
> old TF-M location marked as read-only mirror.
>
> Please use new TF-M URL for your pushing your commits:
>
> ssh://<user-name>@review.trustedfirmware.org:29418/TF-M/trusted-firmware-m
>
> New repo URL:
>
> https://review.trustedfirmware.org/TF-M/trusted-firmware-m
>
> Thanks,
>
> Anton
>
>
--
*Thomas Törnblom*, /Product Engineer/
IAR Systems AB
Box 23051, Strandbodgatan 1
SE-750 23 Uppsala, SWEDEN
Mobile: +46 76 180 17 80 Fax: +46 18 16 78 01
E-mail: thomas.tornblom(a)iar.com <mailto:thomas.tornblom@iar.com>
Website: www.iar.com <http://www.iar.com>
Twitter: www.twitter.com/iarsystems <http://www.twitter.com/iarsystems>
Is this perhaps related to the .gitreview and/or new repo location
changes that appears to have been merged after my last push on Friday?
If so, how to I fix this in my local repo?
Thomas
Den 2020-06-08 kl. 11:53, skrev Thomas Törnblom via TF-M:
> Is there a problem pushing patches currently, or is there something
> I've missed?
>
> I was able to push a patch on Friday, but today I get errors just
> trying to push after a rebase with no changes:
> ---
> PS C:\Users\thomasto\Projects\tf-m1\trusted-firmware-m> git push
> ssh://review.trustedfirmware.org:29418/trusted-firmware-m.git
> HEAD:refs/for/master
> Enumerating objects: 22731, done.
> Counting objects: 100% (22731/22731), done.
> Delta compression using up to 4 threads
> Compressing objects: 100% (7566/7566), done.
> Writing objects: 100% (22731/22731), 11.22 MiB | 6.64 MiB/s, done.
> Total 22731 (delta 15732), reused 21321 (delta 14653)
> remote: Resolving deltas: 100% (15732/15732)
> remote: Processing changes: refs: 1, done
> To ssh://review.trustedfirmware.org:29418/trusted-firmware-m.git
> ! [remote rejected] HEAD -> refs/for/master (prohibited by Gerrit:
> project state does not permit write)
> error: failed to push some refs to
> 'ssh://review.trustedfirmware.org:29418/trusted-firmware-m.git'
> ---
>
> Thomas
>
> --
>
> *Thomas Törnblom*, /Product Engineer/
> IAR Systems AB
> Box 23051, Strandbodgatan 1
> SE-750 23 Uppsala, SWEDEN
> Mobile: +46 76 180 17 80 Fax: +46 18 16 78 01
> E-mail: thomas.tornblom(a)iar.com <mailto:thomas.tornblom@iar.com>
> Website: www.iar.com <http://www.iar.com>
> Twitter: www.twitter.com/iarsystems <http://www.twitter.com/iarsystems>
>
--
*Thomas Törnblom*, /Product Engineer/
IAR Systems AB
Box 23051, Strandbodgatan 1
SE-750 23 Uppsala, SWEDEN
Mobile: +46 76 180 17 80 Fax: +46 18 16 78 01
E-mail: thomas.tornblom(a)iar.com <mailto:thomas.tornblom@iar.com>
Website: www.iar.com <http://www.iar.com>
Twitter: www.twitter.com/iarsystems <http://www.twitter.com/iarsystems>
Hello
TF-M code moved to the new location recently with a redirection link from the original URL - for compatibility purpose.
Unfortunately, Gerrit got confused with two namespaces and several patches got messed up last week. To prevent it from happen again, the old TF-M location marked as read-only mirror.
Please use new TF-M URL for your pushing your commits:
ssh://<user-name>@review.trustedfirmware.org:29418/TF-M/trusted-firmware-m
New repo URL:
https://review.trustedfirmware.org/TF-M/trusted-firmware-m
Thanks,
Anton
Is there a problem pushing patches currently, or is there something I've
missed?
I was able to push a patch on Friday, but today I get errors just trying
to push after a rebase with no changes:
---
PS C:\Users\thomasto\Projects\tf-m1\trusted-firmware-m> git push
ssh://review.trustedfirmware.org:29418/trusted-firmware-m.git
HEAD:refs/for/master
Enumerating objects: 22731, done.
Counting objects: 100% (22731/22731), done.
Delta compression using up to 4 threads
Compressing objects: 100% (7566/7566), done.
Writing objects: 100% (22731/22731), 11.22 MiB | 6.64 MiB/s, done.
Total 22731 (delta 15732), reused 21321 (delta 14653)
remote: Resolving deltas: 100% (15732/15732)
remote: Processing changes: refs: 1, done
To ssh://review.trustedfirmware.org:29418/trusted-firmware-m.git
! [remote rejected] HEAD -> refs/for/master (prohibited by Gerrit:
project state does not permit write)
error: failed to push some refs to
'ssh://review.trustedfirmware.org:29418/trusted-firmware-m.git'
---
Thomas
--
*Thomas Törnblom*, /Product Engineer/
IAR Systems AB
Box 23051, Strandbodgatan 1
SE-750 23 Uppsala, SWEDEN
Mobile: +46 76 180 17 80 Fax: +46 18 16 78 01
E-mail: thomas.tornblom(a)iar.com <mailto:thomas.tornblom@iar.com>
Website: www.iar.com <http://www.iar.com>
Twitter: www.twitter.com/iarsystems <http://www.twitter.com/iarsystems>
