3

Standard workflow in git to checkout code for review:

  1. git fetch -a && git checkout branch-to-review
  2. Other engineer makes some changes and pushes to branch-to-review.
  3. git pull origin branch-to-review to update your local copy to review.

Workflow with Arcanist (via phabricator):

  1. arc patch D123456
  2. Other engineer makes some changes and pushes via arc diff on their end.
  3. ???

In step 3 where we are the code reviewer, how do we pull down the other engineer's most recent changes? arc diff locally seems to want to make more updates but from us.

arc diff --update D123456 shows this warning:

You don't own revision D123456: "Added a new feature and made some updates". Normally, you should only update revisions you
own. You can "Commandeer" this revision from the web interface if you
want to become the owner.

Update this revision anyway? [y/N] 

I can delete the local branch and patch it again, but that seems like the obviously wrong approach.

Geuis
  • 41,122
  • 56
  • 157
  • 219

1 Answers1

0

Have you tried arc sync --revisions?

My usual workflow is:

  1. arc graft <> --skip-landed
  2. Other engineer makes some changes and pushes via arc diff on their end.
  3. arc sync --revisions

In step 3, it walks you through updating your local branches

Rastalamm
  • 1,712
  • 3
  • 23
  • 32