Page MenuHomePhabricator
Differential D8729

Handles an issue in windows with large code bases not squash merging correctly.
ClosedPublic
Actions

Authored by hach-que on Apr 9 2014, 1:49 AM.
Tags
None
Referenced Files
Unknown Object (File)
Thu, Dec 12, 7:49 PM
Unknown Object (File)
Sun, Dec 8, 2:46 PM
Unknown Object (File)
Wed, Dec 4, 9:38 PM
Unknown Object (File)
Wed, Dec 4, 9:38 PM
Unknown Object (File)
Wed, Dec 4, 9:38 PM
Unknown Object (File)
Wed, Dec 4, 9:38 PM
Unknown Object (File)
Wed, Dec 4, 9:38 PM
Unknown Object (File)
Wed, Dec 4, 9:27 PM
View All Files
Subscribers
epriestley
hach-que
Korvin

Details

Reviewers
epriestley
waynea
Group Reviewers
Blessed Reviewers
Maniphest Tasks
T4884: At some point, review hach-que's diffs
Commits
rARC6b8552291dcc: Handles an issue in windows with large code bases not squash merging correctly.
Summary

Handles an issue in windows with large code bases not squash merging correctly, this only catches the issue it doesn't really do any recovery.

Test Plan

We have been running this change in our work environment, it's a hard bug to replicate but when it has reared it's head this has caught it.

Diff Detail

Repository
rARC Arcanist
Lint
Lint Skipped
Unit
Tests Skipped

Event Timeline

waynea updated this revision to Diff 20701.Apr 9 2014, 1:49 AM
waynea retitled this revision from to Handles an issue in windows with large code bases not squahs merging correctly..
waynea updated this object.
waynea edited the test plan for this revision. (Show Details)
waynea added a reviewer: epriestley.
waynea added a subscriber: hach-que.
Herald added a reviewer: Blessed Reviewers.Apr 9 2014, 1:49 AM
Herald added subscribers: Korvin, epriestley.
epriestley requested changes to this revision.Apr 24 2014, 2:38 PM
epriestley edited edge metadata.

I guess I can accept this if you wrap it in a phutil_is_windows() call, but it would be nice to understand what's happening here, since it sounds like there's a fairly severe bug in Git if it's exiting with a dirty working copy.

This revision now requires changes to proceed.Apr 24 2014, 2:38 PM
hach-que commandeered this revision.Apr 30 2014, 12:34 AM
hach-que added a reviewer: waynea.
hach-que updated this revision to Diff 21138.Apr 30 2014, 12:39 AM
hach-que edited edge metadata.
  • Update based on feedback
hach-que updated this revision to Diff 21139.EditedApr 30 2014, 12:40 AM
hach-que edited edge metadata.

Vim decided to change spaces into tabs :(

Harbormaster completed remote builds in B136: Diff 21138.Apr 30 2014, 12:40 AM
Harbormaster completed remote builds in B137: Diff 21139.
epriestley accepted this revision.May 20 2014, 11:41 PM
epriestley edited edge metadata.
This revision is now accepted and ready to land.May 20 2014, 11:41 PM
epriestley added a comment.May 20 2014, 11:42 PM

This prevents reverts

Should this be "this prevents commits"? Or is this actually specific to reverts?

hach-que added a comment.May 20 2014, 11:54 PM

It's a scenario where the squashed commit actually reverts all of the previous changes other people have made.

hach-que retitled this revision from Handles an issue in windows with large code bases not squahs merging correctly. to Handles an issue in windows with large code bases not squash merging correctly..May 21 2014, 12:04 AM
hach-que updated this object.
hach-que edited edge metadata.
hach-que closed this revision.May 21 2014, 12:15 AM
hach-que updated this revision to Diff 21923.

Closed by commit rARC6b8552291dcc (authored by @hach-que).

Revision Contents
Changeset List

PathSize
src/
workflow/
6 lines

Diff 21923

View Options

src/workflow/ArcanistLandWorkflow.php

Loading...
Phabricator · Built by Phacility