annotate tests/test-hgk.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 cf72fd8b3072
children 5fb1fc2e1281
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
12431
d911aa2b8570 tests: unify test-hgk
Matt Mackall <mpm@selenic.com>
parents: 6800
diff changeset
1 Minimal hgk check
6800
cc7114d96548 hgk: ctx.parents() problem introduced by 2d54e7c1e69d
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
2
12431
d911aa2b8570 tests: unify test-hgk
Matt Mackall <mpm@selenic.com>
parents: 6800
diff changeset
3 $ echo "[extensions]" >> $HGRCPATH
d911aa2b8570 tests: unify test-hgk
Matt Mackall <mpm@selenic.com>
parents: 6800
diff changeset
4 $ echo "hgk=" >> $HGRCPATH
d911aa2b8570 tests: unify test-hgk
Matt Mackall <mpm@selenic.com>
parents: 6800
diff changeset
5 $ hg init repo
d911aa2b8570 tests: unify test-hgk
Matt Mackall <mpm@selenic.com>
parents: 6800
diff changeset
6 $ cd repo
d911aa2b8570 tests: unify test-hgk
Matt Mackall <mpm@selenic.com>
parents: 6800
diff changeset
7 $ echo a > a
d911aa2b8570 tests: unify test-hgk
Matt Mackall <mpm@selenic.com>
parents: 6800
diff changeset
8 $ hg ci -Am adda
d911aa2b8570 tests: unify test-hgk
Matt Mackall <mpm@selenic.com>
parents: 6800
diff changeset
9 adding a
d911aa2b8570 tests: unify test-hgk
Matt Mackall <mpm@selenic.com>
parents: 6800
diff changeset
10 $ hg debug-cat-file commit 0
d911aa2b8570 tests: unify test-hgk
Matt Mackall <mpm@selenic.com>
parents: 6800
diff changeset
11 tree a0c8bcbbb45c
d911aa2b8570 tests: unify test-hgk
Matt Mackall <mpm@selenic.com>
parents: 6800
diff changeset
12 parent 000000000000
d911aa2b8570 tests: unify test-hgk
Matt Mackall <mpm@selenic.com>
parents: 6800
diff changeset
13 author test 0 0
d911aa2b8570 tests: unify test-hgk
Matt Mackall <mpm@selenic.com>
parents: 6800
diff changeset
14 revision 0
d911aa2b8570 tests: unify test-hgk
Matt Mackall <mpm@selenic.com>
parents: 6800
diff changeset
15 branch default
18807
cf72fd8b3072 hgk: add support for phases
Andrew Shadura <bugzilla@tut.by>
parents: 17959
diff changeset
16 phase draft
12431
d911aa2b8570 tests: unify test-hgk
Matt Mackall <mpm@selenic.com>
parents: 6800
diff changeset
17
d911aa2b8570 tests: unify test-hgk
Matt Mackall <mpm@selenic.com>
parents: 6800
diff changeset
18 adda
16913
f2719b387380 tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents: 12431
diff changeset
19
f2719b387380 tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents: 12431
diff changeset
20 $ cd ..