This is an archive of the discontinued Mercurial Phabricator instance.

Differential D6507

rebase: tweak description of inmemory working even w/ dirty working dir
ClosedPublic

Authored by spectral on Jun 10 2019, 6:37 PM.

Details

Reviewers
martinvonz
Group Reviewers
hg-reviewers
Commits
rHGcda591d2bfe1: rebase: tweak description of inmemory working even w/ dirty working dir
Summary

One of our users was confused because they read this, and then attempted to run
hg rebase with a dirty working directory, and it still complained. The reason
was that they were attempting to rebase the commit they currently had checked
out, which (at least with evolve workflows enabled) involves updating the
working directory to be based on the newly rebased commit.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

spectral created this revision.Jun 10 2019, 6:37 PM
spectral added a commit: rHGcda591d2bfe1: rebase: tweak description of inmemory working even w/ dirty working dir.Jun 12 2019, 12:44 PM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHGcda591d2bfe1: rebase: tweak description of inmemory working even w/ dirty working dir (authored by spectral). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mhgext/rebase.py (5 lines)

Diff 15457

hgext/rebase.py

across the entire rebase. WARNING: This setting introduces a significant across the entire rebase. WARNING: This setting introduces a significant
risk of losing the work you've done in a rebase if the rebase aborts risk of losing the work you've done in a rebase if the rebase aborts
unexpectedly:: unexpectedly::
[rebase] [rebase]
singletransaction = True singletransaction = True
By default, rebase writes to the working copy, but you can configure it to By default, rebase writes to the working copy, but you can configure it to
run in-memory for for better performance, and to allow it to run if the run in-memory for better performance. When the rebase is not moving the
working copy is dirty:: parent(s) of the working copy (AKA the "currently checked out changesets"),
this may also allow it to run even if the working copy is dirty::
[rebase] [rebase]
experimental.inmemory = True experimental.inmemory = True
Return Values: Return Values:
Returns 0 on success, 1 if nothing to rebase or there are Returns 0 on success, 1 if nothing to rebase or there are
unresolved conflicts. unresolved conflicts.