(stable) Merge 2015 Week 44
dbd45635eccb
Actions

Description

(stable) Merge 2015 Week 44

Details

Provenance

epriestley	Authored on
epriestley	Pushed on Nov 1 2015, 1:30 PM

Differential Revision

D14365: Explicitly provide "--ff" when performing squash merges in "arc land" under Git

Parents

rARCbaf5eb8a8795: Explicitly provide "--ff" when performing squash merges in "arc land" under Git
rARCc0308b7f19a2: (stable) Promote 2015 Week 43

Branches

Unknown

Tags

Unknown

Build Status

Buildable 8514
Build 9817: Run Core Tests

Event Timeline

epriestley committed rARCdbd45635eccb: (stable) Merge 2015 Week 44 (authored by epriestley).Nov 1 2015, 1:30 PM

Harbormaster completed building B8514: rARCdbd45635eccb: (stable) Merge 2015 Week 44.Nov 1 2015, 1:31 PM

Merged Changes

baf5eb8a8795 Explicitly provide "--ff" when performing squash merges in "arc land" under Git
Author
epriestley
Revisions
D14365: Explicitly provide "--ff" when performing squash merges in "arc land" under Git
Browse Repository
Passed
No Audits
c844669326ed After pushing at the end of "arc land", cascade the origin through all local…
Author
epriestley
Revisions
D14361: After pushing at the end of "arc land", cascade the origin through all local tracking branches
Browse Repository
Passed
No Audits
2a2fd6e338b7 Pull git upstream-path logic into a separate class
Author
epriestley
Revisions
D14360: Pull git upstream-path logic into a separate class
Browse Repository
Passed
No Audits
411a4f4a3917 Fix a check when deciding to destroy the local branch after "arc land"
Author
epriestley
Revisions
D14358: Fix a check when deciding to destroy the local branch after "arc land"
Browse Repository
Passed
No Audits
aa5c023fe8fa Make rules for guessing onto/remote more powerful and more explicit in `arc…
Author
epriestley
Revisions
D14357: Make rules for guessing onto/remote more powerful and more explicit in `arc land`
Browse Repository
Passed
No Audits
a03c6079bb71 Make "arc land" great again
Author
epriestley
Revisions
D14356: Make "arc land" great again
Browse Repository
Passed
No Audits
3308da5f8fbe Fix T9635 by initializing the property
Author
Mnkras
Revisions
D14340: Fix T9635 by initializing the property
Browse Repository
Passed
No Audits

Changes (10)

Path

Size

src/

__phutil_library_map__.php

internationalization/

ArcanistUSEnglishTranslation.php

land

ArcanistGitLandEngine.php

ArcanistLandEngine.php

repository/

api/

ArcanistGitAPI.php

ArcanistGitUpstreamPath.php

unit/

engine/

ArcanistUnitTestEngine.php

workflow/

ArcanistLandWorkflow.php

ArcanistWorkflow.php

rARCdbd45635eccb

View Options

src/__phutil_library_map__.php

View Options

src/internationalization/ArcanistUSEnglishTranslation.php

View Options

src/land/ArcanistGitLandEngine.php

View Options

src/land/ArcanistLandEngine.php

View Options

src/repository/api/ArcanistGitAPI.php

View Options

src/repository/api/ArcanistGitUpstreamPath.php

View Options

src/unit/engine/ArcanistUnitTestEngine.php

View Options

src/workflow/ArcanistLandWorkflow.php

View Options

src/workflow/ArcanistWorkflow.php

(stable) Merge 2015 Week 44dbd45635eccbActions

Description

Details

Event Timeline

Merged Changes

Changes (10)

rARCdbd45635eccb

src/__phutil_library_map__.php

src/internationalization/ArcanistUSEnglishTranslation.php

src/land/ArcanistGitLandEngine.php

src/land/ArcanistLandEngine.php

src/repository/api/ArcanistGitAPI.php

src/repository/api/ArcanistGitUpstreamPath.php

src/unit/engine/ArcanistUnitTestEngine.php

src/workflow/ArcanistLandWorkflow.php

src/workflow/ArcanistWorkflow.php

(stable) Merge 2015 Week 44
dbd45635eccb
Actions