view tests/test-dispatch.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 883d887c6408
children 6f9ac3cb0987
line wrap: on
line source

running: init test1
result: None
running: add foo
result: 0
running: commit -m commit1 -d 2000-01-01 foo
result: None
running: commit -m commit2 -d 2000-01-02 foo
result: None
running: log -r 0
changeset:   0:0e4634943879
user:        test
date:        Sat Jan 01 00:00:00 2000 +0000
summary:     commit1

result: None
running: log -r tip
changeset:   1:45589e459b2e
tag:         tip
user:        test
date:        Sun Jan 02 00:00:00 2000 +0000
summary:     commit2

result: None