Mercurial > hg
view tests/test-ancestor.py.out @ 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 | f7f8159caad3 |
children | 731b2a90983b |
line wrap: on
line source
% ancestors of [] and not of [1] [] % ancestors of [] and not of [] [] % ancestors of [12] and not of [] [0, 1, 2, 4, 6, 7, 9, 12] % ancestors of [0] and not of [0] [] % ancestors of [4, 5, 6] and not of [6, 5, 4] [] % ancestors of [-1] and not of [12] [] % ancestors of [12] and not of [-1] [0, 1, 2, 4, 6, 7, 9, 12] % ancestors of [12] and not of [9] [12] % ancestors of [9] and not of [12] [] % ancestors of [12, 9] and not of [7] [6, 9, 12] % ancestors of [7, 6] and not of [12] [] % ancestors of [10] and not of [11, 12] [5, 10] % ancestors of [11] and not of [10] [3, 7, 11] % ancestors of [11] and not of [10, 12] [3, 11] % ancestors of [12] and not of [10] [6, 7, 9, 12] % ancestors of [12] and not of [11] [6, 9, 12] % ancestors of [10, 11, 12] and not of [13] [0, 1, 2, 3, 4, 5, 6, 7, 9, 10, 11, 12] % ancestors of [13] and not of [10, 11, 12] [8, 13] % lazy ancestor set for [], stoprev = 0, inclusive = False [] % lazy ancestor set for [11, 13], stoprev = 0, inclusive = False [7, 8, 3, 4, 1, 0] % lazy ancestor set for [11, 13], stoprev = 0, inclusive = True [11, 13, 7, 8, 3, 4, 1, 0] % lazy ancestor set for [11, 13], stoprev = 6, inclusive = False [7, 8] % lazy ancestor set for [11, 13], stoprev = 6, inclusive = True [11, 13, 7, 8]