Mercurial > hg
annotate tests/bzr-definitions @ 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 | aa9385f983fa |
children | 89872688893f |
rev | line source |
---|---|
7053 | 1 # this file holds the definitions that are used in various bzr tests |
2 | |
3 "$TESTDIR/hghave" bzr || exit 80 | |
4 | |
9042
95046688f80f
tests: remove more instances of export FOO=bar bashism
Brodie Rao <me+hg@dackz.net>
parents:
8523
diff
changeset
|
5 TERM=dumb; export TERM |
7053 | 6 echo '[extensions]' >> $HGRCPATH |
7 echo 'convert = ' >> $HGRCPATH | |
8 | |
9 glog() | |
10 { | |
20117
aa9385f983fa
tests: don't load unnecessary graphlog extension
Martin Geisler <martin@geisler.net>
parents:
16060
diff
changeset
|
11 hg log -G --template '{rev}@{branch} "{desc|firstline}" files: {files}\n' "$@" |
7053 | 12 } |
13 | |
14 manifest() | |
15 { | |
16 echo "% manifest of $2" | |
17 hg -R $1 manifest -v -r $2 | |
18 } |