equal
deleted
inserted
replaced
3143 |
3143 |
3144 if tip is not None and repo.changelog.tip() == tip: |
3144 if tip is not None and repo.changelog.tip() == tip: |
3145 # avoid reporting something like "committed new head" when |
3145 # avoid reporting something like "committed new head" when |
3146 # recommitting old changesets, and issue a helpful warning |
3146 # recommitting old changesets, and issue a helpful warning |
3147 # for most instances |
3147 # for most instances |
3148 repo.ui.warn(_("warning: commit already existed in the repository!\n")) |
3148 repo.ui.warn(_(b"warning: commit already existed in the repository!\n")) |
3149 elif ( |
3149 elif ( |
3150 not opts.get(b'amend') |
3150 not opts.get(b'amend') |
3151 and bheads |
3151 and bheads |
3152 and node not in bheads |
3152 and node not in bheads |
3153 and not any( |
3153 and not any( |