Mercurial > hg
view contrib/dockerrpm @ 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 | 62a2749895e4 |
children | f1bcc33a5c52 |
line wrap: on
line source
#!/bin/bash BUILDDIR=$(dirname $0) ROOTDIR=$(cd $BUILDDIR/..; pwd) if which docker >> /dev/null ; then DOCKER=docker elif which docker.io >> /dev/null ; then DOCKER=docker.io fi $DOCKER build --tag "hg-dockerrpm-$1" - < $BUILDDIR/docker/$1 $DOCKER run --rm -v $ROOTDIR:/hg "hg-dockerrpm-$1" bash -c \ "cp -a hg hg-build; cd hg-build; make clean local $1; cp build/$1/* /hg/build/$1/"