Page MenuHomePhabricator

Fix an issue in arc patch with git-svn
ClosedPublic

Authored by sowedance on Apr 7 2014, 10:53 PM.
Tags
None
Referenced Files
F13961149: D8717.id20669.diff
Tue, Oct 15, 3:27 AM
Unknown Object (File)
Sat, Oct 5, 3:03 PM
Unknown Object (File)
Tue, Oct 1, 8:20 PM
Unknown Object (File)
Sep 11 2024, 7:38 PM
Unknown Object (File)
Sep 11 2024, 7:38 PM
Unknown Object (File)
Sep 11 2024, 7:38 PM
Unknown Object (File)
Sep 11 2024, 7:38 PM
Unknown Object (File)
Sep 10 2024, 7:03 AM
Subscribers

Details

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
Lint
Lint Skipped
Unit
Tests Skipped

Event Timeline

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)

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?

sowedance edited edge metadata.

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

epriestley edited edge metadata.

Awesome, thanks!

This revision is now accepted and ready to land.Apr 8 2014, 5:45 PM
epriestley updated this revision to Diff 20682.

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