[libcxx-commits] [PATCH] D145881: [libc++][spaceship] Implement `operator<=>` for `duration`

Hristo Hristov via Phabricator via libcxx-commits libcxx-commits at lists.llvm.org
Tue Mar 21 11:18:05 PDT 2023


H-G-Hristov added a comment.

In D145881#4210481 <https://reviews.llvm.org/D145881#4210481>, @Mordante wrote:

> In D145881#4210457 <https://reviews.llvm.org/D145881#4210457>, @H-G-Hristov wrote:
>
>> Rebased
>
> Nice I see committing work!
>
> FYI `arc land` will automatically rebase for you. There is no need to update the review with these changes.

Thank you very much!

I got two error messages one after another. So I thought that I needed to rebase to fix them:

> To GitHub-Zingam:llvm/llvm-project.git
>  ! [rejected]                  cac4b7737e82 -> main (fetch first)
> error: failed to push some refs to 'GitHub-Zingam:llvm/llvm-project.git'
> hint: Updates were rejected because the remote contains work that you do
> hint: not have locally. This is usually caused by another repository pushing
> hint: to the same ref. You may want to first integrate the remote changes
> hint: (e.g., 'git pull ...') before pushing again.
> hint: See the 'Note about fast-forwards' in 'git push --help' for details.
>
> LOAD STATE  Restoring local state (to ref "hgh/libcxx/P1614R2-spaceship-operator-duration" at commit "1d649b88b388").
>  USAGE EXCEPTION  Push failed! Fix the error and run "arc land" again.

And then:

> INTO COMMIT  Preparing merge into "main" from remote "origin", at commit "fa6ea7a419f3 <https://reviews.llvm.org/rGfa6ea7a419f37befbed04368bcb8af4c718facbb>".
>
> <!> UNKNOWN REVISION 
> Unable to determine which revision is associated with commit "934d897e41a9".
> Use "arc diff" to create or update a revision with this commit, or
> "--revision" to force selection of a particular revision.
>
> USAGE EXCEPTION  Unable to determine revision for commit "934d897e41a9".

Only after the second rebase and `arc diff --update`-ing twice the `arc land` completed successfuly.

Maybe I did something wrong. I hope that it's not a problem.


Repository:
  rG LLVM Github Monorepo

CHANGES SINCE LAST ACTION
  https://reviews.llvm.org/D145881/new/

https://reviews.llvm.org/D145881



More information about the libcxx-commits mailing list