Mercurial > hg
comparison hgext/rebase.py @ 42447:cda591d2bfe1
rebase: tweak description of inmemory working even w/ dirty working dir
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.
Differential Revision: https://phab.mercurial-scm.org/D6507
author | Kyle Lippincott <spectral@google.com> |
---|---|
date | Mon, 10 Jun 2019 15:35:06 -0700 |
parents | 80a213f9ed87 |
children | 5f2f6912c9e6 |
comparison
equal
deleted
inserted
replaced
42446:055c3e2c44f0 | 42447:cda591d2bfe1 |
---|---|
848 | 848 |
849 [rebase] | 849 [rebase] |
850 singletransaction = True | 850 singletransaction = True |
851 | 851 |
852 By default, rebase writes to the working copy, but you can configure it to | 852 By default, rebase writes to the working copy, but you can configure it to |
853 run in-memory for for better performance, and to allow it to run if the | 853 run in-memory for better performance. When the rebase is not moving the |
854 working copy is dirty:: | 854 parent(s) of the working copy (AKA the "currently checked out changesets"), |
855 this may also allow it to run even if the working copy is dirty:: | |
855 | 856 |
856 [rebase] | 857 [rebase] |
857 experimental.inmemory = True | 858 experimental.inmemory = True |
858 | 859 |
859 Return Values: | 860 Return Values: |