equal
deleted
inserted
replaced
480 """Continues the action when the working copy is clean. The default |
480 """Continues the action when the working copy is clean. The default |
481 behavior is to accept the current commit as the new version of the |
481 behavior is to accept the current commit as the new version of the |
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: |
489 # Nothing changed |
489 # Nothing changed |
490 return ctx, [] |
490 return ctx, [] |