Workflow for working on a gerrit cl from more than one machine

[Erik Corry]

Hi

Do people work on the same gerrit cl from multiple machines?  I tried git cl checkout but it doesn't work.

eg. for https://chromium-review.googlesource.com/c/v8/v8/+/5797602

$ cat ../.gclient
solutions = [
  {
    "name": "v8",
    "url": "https://chromium.googlesource.com/v8/v8.git",
    "deps_file": "DEPS",
    "managed": False,
    "custom_deps": {},
  },
]

$ git cl checkout -v 5797602
No branch found for issue 5797602.

[Daniel Lehmann]

I take the checkout commands from Gerrit, three dots in the top right corner -> "Download patch" -> "Checkout", e.g., for your CL and patch set:

git fetch https://chromium.googlesource.com/v8/v8 refs/changes/02/5797602/2 && git checkout FETCH_HEAD

Best,
Daniel

--
--
v8-dev mailing list
v8-...@googlegroups.com
http://groups.google.com/group/v8-dev
---
You received this message because you are subscribed to the Google Groups "v8-dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email to v8-dev+un...@googlegroups.com.
To view this discussion on the web visit https://groups.google.com/d/msgid/v8-dev/CAHZxHpip84RF-bn29dfVBRUCK0QPAmZWuxEp8QCYA1934JGNoQ%40mail.gmail.com.

Daniel Lehmann

Software Engineer

dleh...@google.com

Google Germany GmbH

Erika-Mann-Straße 33

80636 München

Geschäftsführer: Paul Manicle, Halimah DeLaine Prado

Registergericht und -nummer: Hamburg, HRB 86891

Sitz der Gesellschaft: Hamburg

Diese E-Mail ist vertraulich. Falls Sie diese fälschlicherweise erhalten haben sollten, leiten Sie diese bitte nicht an jemand anderes weiter, löschen Sie alle Kopien und Anhänge davon und lassen Sie mich bitte wissen, dass die E-Mail an die falsche Person gesendet wurde. 

     

This e-mail is confidential. If you received this communication by mistake, please don't forward it to anyone else, please erase all copies and attachments, and please let me know that it has gone to the wrong person.

[Jakob Kummerow]

I use `git cl patch -f 5797602` to patch in a Gerrit issue on another machine. Notably, the `-f` part causes the current branch to be reset to the position that was the ancestor of the uploaded patch, so (1) applying the patch will be guaranteed not to run into merge conflicts, and (2) you can even upload the next patch set from the other machine without accidentally introducing rebasing artifacts.

On Tue, Aug 20, 2024 at 12:17 PM Erik Corry <erik...@chromium.org> wrote:

[Dirk Pranke]

I do what Jacob does, except I don't usually use the -f flag as I don't want to reset the position I have checked out. I didn't even know there was a `git cl checkout`. It seems like a bug that that's not working, though.

-- Dirk

--
--
v8-dev mailing list
v8-...@googlegroups.com
http://groups.google.com/group/v8-dev
---
You received this message because you are subscribed to the Google Groups "v8-dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email to v8-dev+un...@googlegroups.com.

To view this discussion on the web visit https://groups.google.com/d/msgid/v8-dev/CAKSzg3TcCqetMacaa%2BeLFbCWgR%2Bx2rYL0ytXuAN4f0R1kT72Sw%40mail.gmail.com.