Mercurial > hg
comparison tests/test-histedit-non-commute.t @ 28340:c100dbd593e2
histedit: reword message when a changeset produces no changes
There are various ways to use histedit such that an item in
the list of things to perform will not result in a change
relative to the previous repository state.
When that happens, histedit does not keep the commit/message.
This changes the note to try to explain to the user that it
will not be present in their history.
author | timeless <timeless@mozdev.org> |
---|---|
date | Wed, 02 Mar 2016 22:39:03 +0000 |
parents | e7ff83b2bcfe |
children | e5ffc91a2276 |
comparison
equal
deleted
inserted
replaced
28339:67fa77e40702 | 28340:c100dbd593e2 |
---|---|
169 $ hg revert -r 'p1()' e | 169 $ hg revert -r 'p1()' e |
170 $ hg resolve --mark e | 170 $ hg resolve --mark e |
171 (no more unresolved files) | 171 (no more unresolved files) |
172 continue: hg histedit --continue | 172 continue: hg histedit --continue |
173 $ hg histedit --continue 2>&1 | fixbundle | 173 $ hg histedit --continue 2>&1 | fixbundle |
174 7b4e2f4b7bcd: empty changeset | 174 7b4e2f4b7bcd: skipping changeset (no changes) |
175 | 175 |
176 log after edit | 176 log after edit |
177 $ hg log --graph | 177 $ hg log --graph |
178 @ changeset: 6:7efe1373e4bc | 178 @ changeset: 6:7efe1373e4bc |
179 | tag: tip | 179 | tag: tip |
252 $ hg revert -r 'p1()' e | 252 $ hg revert -r 'p1()' e |
253 $ hg resolve --mark e | 253 $ hg resolve --mark e |
254 (no more unresolved files) | 254 (no more unresolved files) |
255 continue: hg histedit --continue | 255 continue: hg histedit --continue |
256 $ hg histedit --continue 2>&1 | fixbundle | 256 $ hg histedit --continue 2>&1 | fixbundle |
257 7b4e2f4b7bcd: empty changeset | 257 7b4e2f4b7bcd: skipping changeset (no changes) |
258 | 258 |
259 post message fix | 259 post message fix |
260 $ hg log --graph | 260 $ hg log --graph |
261 @ changeset: 6:7efe1373e4bc | 261 @ changeset: 6:7efe1373e4bc |
262 | tag: tip | 262 | tag: tip |