Fix an issue in arc patch with git-svn
ClosedPublic
Actions

Authored by • sowedance on Apr 7 2014, 10:53 PM.

Details

Reviewers

epriestley
lifeihuang
JoelB

Group Reviewers

Blessed Reviewers

Commits

rARC0cff627d758c: Fix an issue in arc patch with git-svn

Summary

We recently moved our HEAD and it caused some issues on arc patch with git-svn repos. The base revision is incorrect and patch will fail. Add the check in such case to make it work.
The check was there before but removed in change b202158. The reason wasn't mentioned there though.

Test Plan

Tried it on svn.

Diff Detail

Repository

rARC Arcanist

Branch

patch

Lint

Lint Passed

Unit

No Test Coverage

Event Timeline

• sowedance updated this revision to Diff 20669.Apr 7 2014, 10:53 PM

• sowedance retitled this revision from to Fix an issue in arc patch with git-svn.

• sowedance updated this object.

• sowedance edited the test plan for this revision. (Show Details)

• sowedance added reviewers: epriestley, lifeihuang, JoelB.

Herald added a reviewer: Blessed Reviewers.Apr 7 2014, 10:53 PM

Herald added subscribers: Korvin, epriestley.

I think we can do the right thing (apply to the correct local revision) by calling $api->getCanonicalRevisionName() to convert the possible git-svn base revision into a real Git revision. Does that work?

src/workflow/ArcanistPatchWorkflow.php
268	This seems incorrect -- it reverts the fix for T4596?

Yep that works! Updated based on comments and tested on both git and git-svn.

Awesome, thanks!

This revision is now accepted and ready to land.Apr 8 2014, 5:45 PM

Closed by commit rARC0cff627d758c (authored by @sowedance, committed by @epriestley).

Revision Contents
Changeset List

Path

Size

src/

workflow/

ArcanistPatchWorkflow.php

2 lines

Diff 20681

View Options

src/workflow/ArcanistPatchWorkflow.php

Fix an issue in arc patch with git-svnClosedPublicActions