##// END OF EJS Templates
histedit: reword message when a changeset produces no changes...
timeless -
r28340:c100dbd5 default
parent child Browse files
Show More
@@ -482,7 +482,7 b' class histeditaction(object):'
482 rulectx."""
482 rulectx."""
483 ctx = self.repo['.']
483 ctx = self.repo['.']
484 if ctx.node() == self.state.parentctxnode:
484 if ctx.node() == self.state.parentctxnode:
485 self.repo.ui.warn(_('%s: empty changeset\n') %
485 self.repo.ui.warn(_('%s: skipping changeset (no changes)\n') %
486 node.short(self.node))
486 node.short(self.node))
487 return ctx, [(self.node, tuple())]
487 return ctx, [(self.node, tuple())]
488 if ctx.node() == self.node:
488 if ctx.node() == self.node:
@@ -117,12 +117,14 b' fix up'
117 (hg histedit --continue to resume)
117 (hg histedit --continue to resume)
118
118
119 just continue this time
119 just continue this time
120 keep the non-commuting change, and thus the pending change will be dropped
120 $ hg revert -r 'p1()' e
121 $ hg revert -r 'p1()' e
121 $ hg resolve --mark e
122 $ hg resolve --mark e
122 (no more unresolved files)
123 (no more unresolved files)
123 continue: hg histedit --continue
124 continue: hg histedit --continue
125 $ hg diff
124 $ hg histedit --continue 2>&1 | fixbundle
126 $ hg histedit --continue 2>&1 | fixbundle
125 7b4e2f4b7bcd: empty changeset
127 7b4e2f4b7bcd: skipping changeset (no changes)
126
128
127 log after edit
129 log after edit
128 $ hg log --graph
130 $ hg log --graph
@@ -262,7 +264,7 b' just continue this time'
262 (no more unresolved files)
264 (no more unresolved files)
263 continue: hg histedit --continue
265 continue: hg histedit --continue
264 $ hg histedit --continue 2>&1 | fixbundle
266 $ hg histedit --continue 2>&1 | fixbundle
265 7b4e2f4b7bcd: empty changeset
267 7b4e2f4b7bcd: skipping changeset (no changes)
266
268
267 log after edit
269 log after edit
268 $ hg log --graph
270 $ hg log --graph
@@ -171,7 +171,7 b' just continue this time'
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
@@ -254,7 +254,7 b' second edit also fails, but just continu'
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
General Comments 0
You need to be logged in to leave comments. Login now