Mercurial > hg
comparison tests/test-histedit-drop.t @ 28519:518a5030acba
histedit: have dropmissing abort on empty plan
We noticed that many users have the intuition of laving the editor empty when
they want to abort the operation. The fact that dropmissing allows user to
delete all edited commits is not intuitive even for users that asked for it.
Let's prevent people from this footgun.
author | Mateusz Kwapich <mitrandir@fb.com> |
---|---|
date | Sun, 13 Mar 2016 16:46:49 -0700 |
parents | 34165875fa5d |
children | 5ad164698626 |
comparison
equal
deleted
inserted
replaced
28516:3bf2892f685f | 28519:518a5030acba |
---|---|
151 > pick ee283cb5f2d5 e | 151 > pick ee283cb5f2d5 e |
152 > EOF | 152 > EOF |
153 hg: parse error: missing rules for changeset a4f7421b80f7 | 153 hg: parse error: missing rules for changeset a4f7421b80f7 |
154 (use "drop a4f7421b80f7" to discard, see also: "hg help -e histedit.config") | 154 (use "drop a4f7421b80f7" to discard, see also: "hg help -e histedit.config") |
155 $ hg --config histedit.dropmissing=True histedit cb9a9f314b8b --commands - 2>&1 << EOF | fixbundle | 155 $ hg --config histedit.dropmissing=True histedit cb9a9f314b8b --commands - 2>&1 << EOF | fixbundle |
156 > EOF | |
157 hg: parse error: no rules provided | |
158 (use strip extension to remove commits) | |
159 $ hg --config histedit.dropmissing=True histedit cb9a9f314b8b --commands - 2>&1 << EOF | fixbundle | |
156 > pick cb9a9f314b8b a | 160 > pick cb9a9f314b8b a |
157 > pick ee283cb5f2d5 e | 161 > pick ee283cb5f2d5 e |
158 > EOF | 162 > EOF |
159 $ hg log --graph | 163 $ hg log --graph |
160 @ changeset: 1:e99c679bf03e | 164 @ changeset: 1:e99c679bf03e |