Arc output the correct action being taken
ClosedPublic
Actions

Authored by guywarner on Jan 28 2014, 3:24 PM.

Tags

None

Referenced Files

	Unknown Object (File)
	Tue, Dec 17, 6:20 AM

	Unknown Object (File)
	Sun, Dec 15, 3:53 PM

	Unknown Object (File)
	Wed, Dec 4, 2:55 AM

	Unknown Object (File)
	Thu, Nov 28, 8:18 PM

	Unknown Object (File)
	Thu, Nov 28, 8:17 PM

	Unknown Object (File)
	Thu, Nov 28, 8:17 PM

	Unknown Object (File)
	Thu, Nov 28, 8:17 PM

	Unknown Object (File)
	Thu, Nov 28, 8:03 PM

Subscribers

Details

Reviewers

epriestley

Group Reviewers

Blessed Reviewers

Maniphest Tasks

Restricted Maniphest Task

Commits

rARC14f2f7fdd204: Arc output the correct action being taken

Summary

Refs T3929 - If arc is merging it will say merging * into * vs always saying rebasing * onto *

Test Plan

Make arc do a rebase, then a merge

Diff Detail

Lint

Lint Skipped

Unit

Tests Skipped

Event Timeline

Won't this make it print out both messages? i.e., it will print:

Rebasing..
Merging...

Am I just crazy? I just woke up so let me know if I'm just misreading.

src/workflow/ArcanistLandWorkflow.php
604	I'd expect that the rebase message should go above this line.

That's what happens after I try to do a quick ticket after just waking up.

Moved the rebase echo below if (shouldUpdatewithRebase).

Whew, glad I'm not going crazy. Thanks!

Closed by commit rARC14f2f7fdd204 (authored by @guywarner, committed by @epriestley).

Revision Contents
Changeset List

Path

Size

src/

workflow/

ArcanistLandWorkflow.php

13 lines

Diff 18293

View Options

src/workflow/ArcanistLandWorkflow.php

Arc output the correct action being takenClosedPublicActions