Mercurial > hg
annotate tests/test-pull-permission.t @ 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 | e54a078153f7 |
children | 8fb6844a4ff1 |
rev | line source |
---|---|
20008
e54a078153f7
tests: skip tests that require not having root (issue4089)
Matt Mackall <mpm@selenic.com>
parents:
16913
diff
changeset
|
1 #if unix-permissions no-root |
15516
10f302f5e9f6
tests: add missing 'hghave unix-permissions'
Mads Kiilerich <mads@kiilerich.com>
parents:
13956
diff
changeset
|
2 |
13956
ffb5c09ba822
tests: remove redundant mkdir
Martin Geisler <mg@lazybytes.net>
parents:
12279
diff
changeset
|
3 $ hg init a |
12279 | 4 $ cd a |
5 $ echo foo > b | |
6 $ hg add b | |
7 $ hg ci -m "b" | |
1244
937ee88da3ef
clone: fall back to pull if we can't lock the source repo
mpm@selenic.com
parents:
diff
changeset
|
8 |
12279 | 9 $ chmod -w .hg/store |
10 | |
11 $ cd .. | |
1244
937ee88da3ef
clone: fall back to pull if we can't lock the source repo
mpm@selenic.com
parents:
diff
changeset
|
12 |
12279 | 13 $ hg clone a b |
14 requesting all changes | |
15 adding changesets | |
16 adding manifests | |
17 adding file changes | |
18 added 1 changesets with 1 changes to 1 files | |
19 updating to branch default | |
20 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
1244
937ee88da3ef
clone: fall back to pull if we can't lock the source repo
mpm@selenic.com
parents:
diff
changeset
|
21 |
12279 | 22 $ chmod +w a/.hg/store # let test clean up |
1750
955a7caf005c
make test-pull-permission cleanup correctly in case of errors
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1244
diff
changeset
|
23 |
12279 | 24 $ cd b |
25 $ hg verify | |
26 checking changesets | |
27 checking manifests | |
28 crosschecking files in changesets and manifests | |
29 checking files | |
30 1 files, 1 changesets, 1 total revisions | |
1750
955a7caf005c
make test-pull-permission cleanup correctly in case of errors
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1244
diff
changeset
|
31 |
16913
f2719b387380
tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents:
15516
diff
changeset
|
32 $ cd .. |
20008
e54a078153f7
tests: skip tests that require not having root (issue4089)
Matt Mackall <mpm@selenic.com>
parents:
16913
diff
changeset
|
33 |
e54a078153f7
tests: skip tests that require not having root (issue4089)
Matt Mackall <mpm@selenic.com>
parents:
16913
diff
changeset
|
34 #endif |