arc land help mention --update-with-rebase work with git, but running it says it is not supported
Closed, ResolvedPublic
Actions

Assigned To

Authored By

	deadalnix
	Jun 9 2017, 1:41 PM

Description

$ arc land -- help
[...]
    --update-with-rebase
            Supports: git
            When updating the feature branch, use rebase instead of merge.
            This might make things work better in some cases. Set
            arc.land.update.default to 'rebase' to make this the default.

However:

$ arc land --update-with-rebase
Landing current branch 'foobar'.
 TARGET  Landing onto "master", the default target under git.
 REMOTE  Using remote "origin", the default remote under git.
Usage Exception: Flag "--update-with-rebase" is no longer supported under Git.

I'm getting mixed messages here. The version of arcanist used is the one packaged in debian.

Revisions and Commits

rARC Arcanist
	D18108	rARCc04f141ab023 Remove obsolete "arc land" flags: --update-with-merge/rebase, --delete-remote

Related Objects

Mentioned In: T12650: Allow setting --delete-remote on .arcrc
Mentioned Here: D14356: Make "arc land" great again
D18108: Remove obsolete "arc land" flags: --update-with-merge/rebase, --delete-remote

Event Timeline

deadalnix created this task.Jun 9 2017, 1:41 PM

The version of arcanist used is the one packaged in debian.

For future reference, please note that we don't package Arcanist for Debian and do not support it, and generally only provide support for bugs reported with a supported version of Arcanist.

epriestley mentioned this in T12650: Allow setting --delete-remote on .arcrc.Jun 9 2017, 1:56 PM

epriestley added a revision: D18108: Remove obsolete "arc land" flags: --update-with-merge/rebase, --delete-remote.Jun 9 2017, 1:58 PM

Prior to October 2015, this flag only had an effect under git. This is why it says "Supports: git".

This flag was disabled in October 2015 (D14356) because we made a change which replaced the "rebase" and "merge" strategies with a different ("headless") strategy, so it was no longer meaningful to select between the strategies. It wasn't clear if the new strategy would work well in all cases or not, so I left the flags in place to see if users ran into issues.

They didn't, so D18108 removes these flags.

epriestley claimed this task.Jun 9 2017, 2:02 PM

epriestley triaged this task as Wishlist priority.

epriestley added a project: Arcanist.

By headless strategy you mean the squash and merge one ?