Mercurial > hg
view tests/test-bad-extension.t @ 21553:bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
The `hg import` command gains a `--partial` flag. When specified, a commit will
always be created from a patch import. Any hunk that fails to apply will
create .rej file, same as what `hg qimport` would do. This change is mainly
aimed at preserving changeset metadata when applying a patch, something very
important for reviewers.
In case of failure with `--partial`, `hg import` returns 1 and the following
message is displayed:
patch applied partially
(fix the .rej files and run `hg commit --amend`)
When multiple patches are imported, we stop at the first one with failed hunks.
In the future, someone may feel brave enough to tackle a --continue flag to
import.
author | Pierre-Yves David <pierre-yves.david@fb.com> |
---|---|
date | Thu, 08 May 2014 17:08:17 -0700 |
parents | 005a540e9aee |
children | e955549cd045 |
line wrap: on
line source
$ echo 'raise Exception("bit bucket overflow")' > badext.py $ abspath=`pwd`/badext.py $ echo '[extensions]' >> $HGRCPATH $ echo "gpg =" >> $HGRCPATH $ echo "hgext.gpg =" >> $HGRCPATH $ echo "badext = $abspath" >> $HGRCPATH $ echo "badext2 =" >> $HGRCPATH $ hg -q help help *** failed to import extension badext from $TESTTMP/badext.py: bit bucket overflow *** failed to import extension badext2: No module named badext2 hg help [-ec] [TOPIC] show help for a given topic or a help overview