4605 even if some hunks fail to apply. Hunks that fail to apply will be |
4605 even if some hunks fail to apply. Hunks that fail to apply will be |
4606 written to a <target-file>.rej file. Conflicts can then be resolved |
4606 written to a <target-file>.rej file. Conflicts can then be resolved |
4607 by hand before :hg:`commit --amend` is run to update the created |
4607 by hand before :hg:`commit --amend` is run to update the created |
4608 changeset. This flag exists to let people import patches that |
4608 changeset. This flag exists to let people import patches that |
4609 partially apply without losing the associated metadata (author, |
4609 partially apply without losing the associated metadata (author, |
4610 date, description, ...). Note that when none of the hunk applies |
4610 date, description, ...). |
4611 cleanly, :hg:`import --partial` will create an empty changeset, |
4611 |
4612 importing only the patch metadata. |
4612 .. note:: |
|
4613 |
|
4614 When no hunks apply cleanly, :hg:`import --partial` will create |
|
4615 an empty changeset, importing only the patch metadata. |
4613 |
4616 |
4614 With -s/--similarity, hg will attempt to discover renames and |
4617 With -s/--similarity, hg will attempt to discover renames and |
4615 copies in the patch in the same way as :hg:`addremove`. |
4618 copies in the patch in the same way as :hg:`addremove`. |
4616 |
4619 |
4617 It is possible to use external patch programs to perform the patch |
4620 It is possible to use external patch programs to perform the patch |