Mercurial > hg
annotate tests/test-import.t @ 21585:652e07debf10
merge with stable
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Tue, 27 May 2014 17:41:20 -0700 |
parents | bee0e1cffdd3 |
children | f3200bf460a8 |
rev | line source |
---|---|
11807
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
1 $ hg init a |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
2 $ mkdir a/d1 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
3 $ mkdir a/d1/d2 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
4 $ echo line 1 > a/a |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
5 $ echo line 1 > a/d1/d2/a |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
6 $ hg --cwd a ci -Ama |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
7 adding a |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
8 adding d1/d2/a |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
9 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
10 $ echo line 2 >> a/a |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
11 $ hg --cwd a ci -u someone -d '1 0' -m'second change' |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
12 |
15327
67e92d29ecb5
import: abort usefully if no patch name given
Kevin Bullock <kbullock@ringworld.org>
parents:
15198
diff
changeset
|
13 import with no args: |
67e92d29ecb5
import: abort usefully if no patch name given
Kevin Bullock <kbullock@ringworld.org>
parents:
15198
diff
changeset
|
14 |
67e92d29ecb5
import: abort usefully if no patch name given
Kevin Bullock <kbullock@ringworld.org>
parents:
15198
diff
changeset
|
15 $ hg --cwd a import |
67e92d29ecb5
import: abort usefully if no patch name given
Kevin Bullock <kbullock@ringworld.org>
parents:
15198
diff
changeset
|
16 abort: need at least one patch to import |
67e92d29ecb5
import: abort usefully if no patch name given
Kevin Bullock <kbullock@ringworld.org>
parents:
15198
diff
changeset
|
17 [255] |
11807
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
18 |
14125
2852843947da
tests: do not export several times the same patch/diff in test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
13446
diff
changeset
|
19 generate patches for the test |
2852843947da
tests: do not export several times the same patch/diff in test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
13446
diff
changeset
|
20 |
2852843947da
tests: do not export several times the same patch/diff in test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
13446
diff
changeset
|
21 $ hg --cwd a export tip > exported-tip.patch |
2852843947da
tests: do not export several times the same patch/diff in test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
13446
diff
changeset
|
22 $ hg --cwd a diff -r0:1 > diffed-tip.patch |
2852843947da
tests: do not export several times the same patch/diff in test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
13446
diff
changeset
|
23 |
2852843947da
tests: do not export several times the same patch/diff in test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
13446
diff
changeset
|
24 |
11807
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
25 import exported patch |
21417
308aaeb956e2
import: use "getcommiteditor()" instead of explicit editor choice
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
19513
diff
changeset
|
26 (this also tests that editor is not invoked, if the patch contains the |
308aaeb956e2
import: use "getcommiteditor()" instead of explicit editor choice
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
19513
diff
changeset
|
27 commit message and '--edit' is not specified) |
2513
f22e3e8fd457
import: added tests, fixed bugs found by tests and asak.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
28 |
11807
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
29 $ hg clone -r0 a b |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
30 adding changesets |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
31 adding manifests |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
32 adding file changes |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
33 added 1 changesets with 2 changes to 2 files |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
34 updating to branch default |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
35 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
21417
308aaeb956e2
import: use "getcommiteditor()" instead of explicit editor choice
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
19513
diff
changeset
|
36 $ HGEDITOR=cat hg --cwd b import ../exported-tip.patch |
14125
2852843947da
tests: do not export several times the same patch/diff in test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
13446
diff
changeset
|
37 applying ../exported-tip.patch |
2513
f22e3e8fd457
import: added tests, fixed bugs found by tests and asak.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
38 |
18648
76b69cccb07a
export: show 'Date' header in a format that also is readable for humans
Mads Kiilerich <mads@kiilerich.com>
parents:
17712
diff
changeset
|
39 message and committer and date should be same |
11807
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
40 |
14125
2852843947da
tests: do not export several times the same patch/diff in test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
13446
diff
changeset
|
41 $ hg --cwd b tip |
2852843947da
tests: do not export several times the same patch/diff in test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
13446
diff
changeset
|
42 changeset: 1:1d4bd90af0e4 |
2852843947da
tests: do not export several times the same patch/diff in test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
13446
diff
changeset
|
43 tag: tip |
2852843947da
tests: do not export several times the same patch/diff in test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
13446
diff
changeset
|
44 user: someone |
2852843947da
tests: do not export several times the same patch/diff in test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
13446
diff
changeset
|
45 date: Thu Jan 01 00:00:01 1970 +0000 |
11807
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
46 summary: second change |
14125
2852843947da
tests: do not export several times the same patch/diff in test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
13446
diff
changeset
|
47 |
11807
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
48 $ rm -r b |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
49 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
50 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
51 import exported patch with external patcher |
21417
308aaeb956e2
import: use "getcommiteditor()" instead of explicit editor choice
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
19513
diff
changeset
|
52 (this also tests that editor is invoked, if the '--edit' is specified, |
308aaeb956e2
import: use "getcommiteditor()" instead of explicit editor choice
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
19513
diff
changeset
|
53 regardless of the commit message in the patch) |
2513
f22e3e8fd457
import: added tests, fixed bugs found by tests and asak.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
54 |
11807
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
55 $ cat > dummypatch.py <<EOF |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
56 > print 'patching file a' |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
57 > file('a', 'wb').write('line2\n') |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
58 > EOF |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
59 $ hg clone -r0 a b |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
60 adding changesets |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
61 adding manifests |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
62 adding file changes |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
63 added 1 changesets with 2 changes to 2 files |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
64 updating to branch default |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
65 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
21417
308aaeb956e2
import: use "getcommiteditor()" instead of explicit editor choice
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
19513
diff
changeset
|
66 $ HGEDITOR=cat hg --config ui.patch='python ../dummypatch.py' --cwd b import --edit ../exported-tip.patch |
14125
2852843947da
tests: do not export several times the same patch/diff in test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
13446
diff
changeset
|
67 applying ../exported-tip.patch |
21417
308aaeb956e2
import: use "getcommiteditor()" instead of explicit editor choice
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
19513
diff
changeset
|
68 second change |
308aaeb956e2
import: use "getcommiteditor()" instead of explicit editor choice
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
19513
diff
changeset
|
69 |
308aaeb956e2
import: use "getcommiteditor()" instead of explicit editor choice
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
19513
diff
changeset
|
70 |
308aaeb956e2
import: use "getcommiteditor()" instead of explicit editor choice
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
19513
diff
changeset
|
71 HG: Enter commit message. Lines beginning with 'HG:' are removed. |
308aaeb956e2
import: use "getcommiteditor()" instead of explicit editor choice
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
19513
diff
changeset
|
72 HG: Leave message empty to abort commit. |
308aaeb956e2
import: use "getcommiteditor()" instead of explicit editor choice
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
19513
diff
changeset
|
73 HG: -- |
308aaeb956e2
import: use "getcommiteditor()" instead of explicit editor choice
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
19513
diff
changeset
|
74 HG: user: someone |
308aaeb956e2
import: use "getcommiteditor()" instead of explicit editor choice
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
19513
diff
changeset
|
75 HG: branch 'default' |
308aaeb956e2
import: use "getcommiteditor()" instead of explicit editor choice
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
19513
diff
changeset
|
76 HG: changed a |
11807
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
77 $ cat b/a |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
78 line2 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
79 $ rm -r b |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
80 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
81 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
82 import of plain diff should fail without message |
21417
308aaeb956e2
import: use "getcommiteditor()" instead of explicit editor choice
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
19513
diff
changeset
|
83 (this also tests that editor is invoked, if the patch doesn't contain |
308aaeb956e2
import: use "getcommiteditor()" instead of explicit editor choice
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
19513
diff
changeset
|
84 the commit message, regardless of '--edit') |
2513
f22e3e8fd457
import: added tests, fixed bugs found by tests and asak.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
85 |
11807
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
86 $ hg clone -r0 a b |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
87 adding changesets |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
88 adding manifests |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
89 adding file changes |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
90 added 1 changesets with 2 changes to 2 files |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
91 updating to branch default |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
92 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
21417
308aaeb956e2
import: use "getcommiteditor()" instead of explicit editor choice
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
19513
diff
changeset
|
93 $ HGEDITOR=cat hg --cwd b import ../diffed-tip.patch |
14125
2852843947da
tests: do not export several times the same patch/diff in test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
13446
diff
changeset
|
94 applying ../diffed-tip.patch |
21417
308aaeb956e2
import: use "getcommiteditor()" instead of explicit editor choice
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
19513
diff
changeset
|
95 |
308aaeb956e2
import: use "getcommiteditor()" instead of explicit editor choice
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
19513
diff
changeset
|
96 |
308aaeb956e2
import: use "getcommiteditor()" instead of explicit editor choice
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
19513
diff
changeset
|
97 HG: Enter commit message. Lines beginning with 'HG:' are removed. |
308aaeb956e2
import: use "getcommiteditor()" instead of explicit editor choice
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
19513
diff
changeset
|
98 HG: Leave message empty to abort commit. |
308aaeb956e2
import: use "getcommiteditor()" instead of explicit editor choice
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
19513
diff
changeset
|
99 HG: -- |
308aaeb956e2
import: use "getcommiteditor()" instead of explicit editor choice
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
19513
diff
changeset
|
100 HG: user: test |
308aaeb956e2
import: use "getcommiteditor()" instead of explicit editor choice
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
19513
diff
changeset
|
101 HG: branch 'default' |
308aaeb956e2
import: use "getcommiteditor()" instead of explicit editor choice
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
19513
diff
changeset
|
102 HG: changed a |
11807
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
103 abort: empty commit message |
12316
4134686b83e1
tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents:
11807
diff
changeset
|
104 [255] |
11807
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
105 $ rm -r b |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
106 |
7247
c4461ea8b4c8
patch: fix patched files records in externalpatcher()
Patrick Mezard <pmezard@gmail.com>
parents:
6758
diff
changeset
|
107 |
11807
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
108 import of plain diff should be ok with message |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
109 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
110 $ hg clone -r0 a b |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
111 adding changesets |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
112 adding manifests |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
113 adding file changes |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
114 added 1 changesets with 2 changes to 2 files |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
115 updating to branch default |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
116 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
14125
2852843947da
tests: do not export several times the same patch/diff in test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
13446
diff
changeset
|
117 $ hg --cwd b import -mpatch ../diffed-tip.patch |
2852843947da
tests: do not export several times the same patch/diff in test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
13446
diff
changeset
|
118 applying ../diffed-tip.patch |
11807
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
119 $ rm -r b |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
120 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
121 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
122 import of plain diff with specific date and user |
21417
308aaeb956e2
import: use "getcommiteditor()" instead of explicit editor choice
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
19513
diff
changeset
|
123 (this also tests that editor is not invoked, if |
308aaeb956e2
import: use "getcommiteditor()" instead of explicit editor choice
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
19513
diff
changeset
|
124 '--message'/'--logfile' is specified and '--edit' is not) |
2513
f22e3e8fd457
import: added tests, fixed bugs found by tests and asak.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
125 |
11807
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
126 $ hg clone -r0 a b |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
127 adding changesets |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
128 adding manifests |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
129 adding file changes |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
130 added 1 changesets with 2 changes to 2 files |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
131 updating to branch default |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
132 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
14125
2852843947da
tests: do not export several times the same patch/diff in test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
13446
diff
changeset
|
133 $ hg --cwd b import -mpatch -d '1 0' -u 'user@nowhere.net' ../diffed-tip.patch |
2852843947da
tests: do not export several times the same patch/diff in test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
13446
diff
changeset
|
134 applying ../diffed-tip.patch |
11807
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
135 $ hg -R b tip -pv |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
136 changeset: 1:ca68f19f3a40 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
137 tag: tip |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
138 user: user@nowhere.net |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
139 date: Thu Jan 01 00:00:01 1970 +0000 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
140 files: a |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
141 description: |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
142 patch |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
143 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
144 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
145 diff -r 80971e65b431 -r ca68f19f3a40 a |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
146 --- a/a Thu Jan 01 00:00:00 1970 +0000 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
147 +++ b/a Thu Jan 01 00:00:01 1970 +0000 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
148 @@ -1,1 +1,2 @@ |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
149 line 1 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
150 +line 2 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
151 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
152 $ rm -r b |
2513
f22e3e8fd457
import: added tests, fixed bugs found by tests and asak.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
153 |
11807
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
154 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
155 import of plain diff should be ok with --no-commit |
21417
308aaeb956e2
import: use "getcommiteditor()" instead of explicit editor choice
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
19513
diff
changeset
|
156 (this also tests that editor is not invoked, if '--no-commit' is |
308aaeb956e2
import: use "getcommiteditor()" instead of explicit editor choice
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
19513
diff
changeset
|
157 specified, regardless of '--edit') |
5953
e7f1be4bf40a
Permitting the import command to accept a --user option.
Jesse Glick <jesse.glick@sun.com>
parents:
5937
diff
changeset
|
158 |
11807
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
159 $ hg clone -r0 a b |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
160 adding changesets |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
161 adding manifests |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
162 adding file changes |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
163 added 1 changesets with 2 changes to 2 files |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
164 updating to branch default |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
165 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
21417
308aaeb956e2
import: use "getcommiteditor()" instead of explicit editor choice
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
19513
diff
changeset
|
166 $ HGEDITOR=cat hg --cwd b import --no-commit --edit ../diffed-tip.patch |
14125
2852843947da
tests: do not export several times the same patch/diff in test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
13446
diff
changeset
|
167 applying ../diffed-tip.patch |
11807
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
168 $ hg --cwd b diff --nodates |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
169 diff -r 80971e65b431 a |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
170 --- a/a |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
171 +++ b/a |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
172 @@ -1,1 +1,2 @@ |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
173 line 1 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
174 +line 2 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
175 $ rm -r b |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
176 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
177 |
12675
c6cdc123f6e4
patch: fails immediately upon malformed hunk
Patrick Mezard <pmezard@gmail.com>
parents:
12399
diff
changeset
|
178 import of malformed plain diff should fail |
c6cdc123f6e4
patch: fails immediately upon malformed hunk
Patrick Mezard <pmezard@gmail.com>
parents:
12399
diff
changeset
|
179 |
c6cdc123f6e4
patch: fails immediately upon malformed hunk
Patrick Mezard <pmezard@gmail.com>
parents:
12399
diff
changeset
|
180 $ hg clone -r0 a b |
c6cdc123f6e4
patch: fails immediately upon malformed hunk
Patrick Mezard <pmezard@gmail.com>
parents:
12399
diff
changeset
|
181 adding changesets |
c6cdc123f6e4
patch: fails immediately upon malformed hunk
Patrick Mezard <pmezard@gmail.com>
parents:
12399
diff
changeset
|
182 adding manifests |
c6cdc123f6e4
patch: fails immediately upon malformed hunk
Patrick Mezard <pmezard@gmail.com>
parents:
12399
diff
changeset
|
183 adding file changes |
c6cdc123f6e4
patch: fails immediately upon malformed hunk
Patrick Mezard <pmezard@gmail.com>
parents:
12399
diff
changeset
|
184 added 1 changesets with 2 changes to 2 files |
c6cdc123f6e4
patch: fails immediately upon malformed hunk
Patrick Mezard <pmezard@gmail.com>
parents:
12399
diff
changeset
|
185 updating to branch default |
c6cdc123f6e4
patch: fails immediately upon malformed hunk
Patrick Mezard <pmezard@gmail.com>
parents:
12399
diff
changeset
|
186 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
14125
2852843947da
tests: do not export several times the same patch/diff in test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
13446
diff
changeset
|
187 $ sed 's/1,1/foo/' < diffed-tip.patch > broken.patch |
12675
c6cdc123f6e4
patch: fails immediately upon malformed hunk
Patrick Mezard <pmezard@gmail.com>
parents:
12399
diff
changeset
|
188 $ hg --cwd b import -mpatch ../broken.patch |
c6cdc123f6e4
patch: fails immediately upon malformed hunk
Patrick Mezard <pmezard@gmail.com>
parents:
12399
diff
changeset
|
189 applying ../broken.patch |
c6cdc123f6e4
patch: fails immediately upon malformed hunk
Patrick Mezard <pmezard@gmail.com>
parents:
12399
diff
changeset
|
190 abort: bad hunk #1 |
c6cdc123f6e4
patch: fails immediately upon malformed hunk
Patrick Mezard <pmezard@gmail.com>
parents:
12399
diff
changeset
|
191 [255] |
c6cdc123f6e4
patch: fails immediately upon malformed hunk
Patrick Mezard <pmezard@gmail.com>
parents:
12399
diff
changeset
|
192 $ rm -r b |
c6cdc123f6e4
patch: fails immediately upon malformed hunk
Patrick Mezard <pmezard@gmail.com>
parents:
12399
diff
changeset
|
193 |
c6cdc123f6e4
patch: fails immediately upon malformed hunk
Patrick Mezard <pmezard@gmail.com>
parents:
12399
diff
changeset
|
194 |
11807
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
195 hg -R repo import |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
196 put the clone in a subdir - having a directory named "a" |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
197 used to hide a bug. |
5937
d8878742a924
Test case for hg import --no-commit
Thomas Arendsen Hein <thomas@intevation.de>
parents:
5853
diff
changeset
|
198 |
11807
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
199 $ mkdir dir |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
200 $ hg clone -r0 a dir/b |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
201 adding changesets |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
202 adding manifests |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
203 adding file changes |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
204 added 1 changesets with 2 changes to 2 files |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
205 updating to branch default |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
206 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
207 $ cd dir |
14125
2852843947da
tests: do not export several times the same patch/diff in test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
13446
diff
changeset
|
208 $ hg -R b import ../exported-tip.patch |
2852843947da
tests: do not export several times the same patch/diff in test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
13446
diff
changeset
|
209 applying ../exported-tip.patch |
11807
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
210 $ cd .. |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
211 $ rm -r dir |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
212 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
213 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
214 import from stdin |
4230
c93562fb12cc
Fix handling of paths when run outside the repo.
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3988
diff
changeset
|
215 |
11807
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
216 $ hg clone -r0 a b |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
217 adding changesets |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
218 adding manifests |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
219 adding file changes |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
220 added 1 changesets with 2 changes to 2 files |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
221 updating to branch default |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
222 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
14125
2852843947da
tests: do not export several times the same patch/diff in test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
13446
diff
changeset
|
223 $ hg --cwd b import - < exported-tip.patch |
11807
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
224 applying patch from stdin |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
225 $ rm -r b |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
226 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
227 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
228 import two patches in one stream |
2513
f22e3e8fd457
import: added tests, fixed bugs found by tests and asak.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
229 |
11807
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
230 $ hg init b |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
231 $ hg --cwd a export 0:tip | hg --cwd b import - |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
232 applying patch from stdin |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
233 $ hg --cwd a id |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
234 1d4bd90af0e4 tip |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
235 $ hg --cwd b id |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
236 1d4bd90af0e4 tip |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
237 $ rm -r b |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
238 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
239 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
240 override commit message |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
241 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
242 $ hg clone -r0 a b |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
243 adding changesets |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
244 adding manifests |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
245 adding file changes |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
246 added 1 changesets with 2 changes to 2 files |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
247 updating to branch default |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
248 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
14125
2852843947da
tests: do not export several times the same patch/diff in test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
13446
diff
changeset
|
249 $ hg --cwd b import -m 'override' - < exported-tip.patch |
11807
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
250 applying patch from stdin |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
251 $ hg --cwd b tip | grep override |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
252 summary: override |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
253 $ rm -r b |
10384
832f35386067
import: import each patch in a file or stream as a separate change
Brendan Cully <brendan@kublai.com>
parents:
9594
diff
changeset
|
254 |
11807
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
255 $ cat > mkmsg.py <<EOF |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
256 > import email.Message, sys |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
257 > msg = email.Message.Message() |
14125
2852843947da
tests: do not export several times the same patch/diff in test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
13446
diff
changeset
|
258 > patch = open(sys.argv[1], 'rb').read() |
2852843947da
tests: do not export several times the same patch/diff in test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
13446
diff
changeset
|
259 > msg.set_payload('email commit message\n' + patch) |
11807
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
260 > msg['Subject'] = 'email patch' |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
261 > msg['From'] = 'email patcher' |
15522
cf0f3cb8a332
tests: don't use stdout redirection for test data
Mads Kiilerich <mads@kiilerich.com>
parents:
15462
diff
changeset
|
262 > file(sys.argv[2], 'wb').write(msg.as_string()) |
11807
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
263 > EOF |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
264 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
265 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
266 plain diff in email, subject, message body |
2513
f22e3e8fd457
import: added tests, fixed bugs found by tests and asak.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
267 |
11807
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
268 $ hg clone -r0 a b |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
269 adding changesets |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
270 adding manifests |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
271 adding file changes |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
272 added 1 changesets with 2 changes to 2 files |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
273 updating to branch default |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
274 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
15522
cf0f3cb8a332
tests: don't use stdout redirection for test data
Mads Kiilerich <mads@kiilerich.com>
parents:
15462
diff
changeset
|
275 $ python mkmsg.py diffed-tip.patch msg.patch |
11807
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
276 $ hg --cwd b import ../msg.patch |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
277 applying ../msg.patch |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
278 $ hg --cwd b tip | grep email |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
279 user: email patcher |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
280 summary: email patch |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
281 $ rm -r b |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
282 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
283 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
284 plain diff in email, no subject, message body |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
285 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
286 $ hg clone -r0 a b |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
287 adding changesets |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
288 adding manifests |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
289 adding file changes |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
290 added 1 changesets with 2 changes to 2 files |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
291 updating to branch default |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
292 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
293 $ grep -v '^Subject:' msg.patch | hg --cwd b import - |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
294 applying patch from stdin |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
295 $ rm -r b |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
296 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
297 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
298 plain diff in email, subject, no message body |
2513
f22e3e8fd457
import: added tests, fixed bugs found by tests and asak.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
299 |
11807
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
300 $ hg clone -r0 a b |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
301 adding changesets |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
302 adding manifests |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
303 adding file changes |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
304 added 1 changesets with 2 changes to 2 files |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
305 updating to branch default |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
306 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
307 $ grep -v '^email ' msg.patch | hg --cwd b import - |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
308 applying patch from stdin |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
309 $ rm -r b |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
310 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
311 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
312 plain diff in email, no subject, no message body, should fail |
2513
f22e3e8fd457
import: added tests, fixed bugs found by tests and asak.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
313 |
11807
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
314 $ hg clone -r0 a b |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
315 adding changesets |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
316 adding manifests |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
317 adding file changes |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
318 added 1 changesets with 2 changes to 2 files |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
319 updating to branch default |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
320 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
321 $ egrep -v '^(Subject|email)' msg.patch | hg --cwd b import - |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
322 applying patch from stdin |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
323 abort: empty commit message |
12316
4134686b83e1
tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents:
11807
diff
changeset
|
324 [255] |
11807
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
325 $ rm -r b |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
326 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
327 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
328 hg export in email, should use patch header |
2513
f22e3e8fd457
import: added tests, fixed bugs found by tests and asak.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
329 |
11807
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
330 $ hg clone -r0 a b |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
331 adding changesets |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
332 adding manifests |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
333 adding file changes |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
334 added 1 changesets with 2 changes to 2 files |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
335 updating to branch default |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
336 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
15522
cf0f3cb8a332
tests: don't use stdout redirection for test data
Mads Kiilerich <mads@kiilerich.com>
parents:
15462
diff
changeset
|
337 $ python mkmsg.py exported-tip.patch msg.patch |
cf0f3cb8a332
tests: don't use stdout redirection for test data
Mads Kiilerich <mads@kiilerich.com>
parents:
15462
diff
changeset
|
338 $ cat msg.patch | hg --cwd b import - |
11807
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
339 applying patch from stdin |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
340 $ hg --cwd b tip | grep second |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
341 summary: second change |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
342 $ rm -r b |
2513
f22e3e8fd457
import: added tests, fixed bugs found by tests and asak.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
343 |
11807
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
344 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
345 subject: duplicate detection, removal of [PATCH] |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
346 The '---' tests the gitsendmail handling without proper mail headers |
2513
f22e3e8fd457
import: added tests, fixed bugs found by tests and asak.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
347 |
11807
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
348 $ cat > mkmsg2.py <<EOF |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
349 > import email.Message, sys |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
350 > msg = email.Message.Message() |
14125
2852843947da
tests: do not export several times the same patch/diff in test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
13446
diff
changeset
|
351 > patch = open(sys.argv[1], 'rb').read() |
2852843947da
tests: do not export several times the same patch/diff in test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
13446
diff
changeset
|
352 > msg.set_payload('email patch\n\nnext line\n---\n' + patch) |
11807
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
353 > msg['Subject'] = '[PATCH] email patch' |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
354 > msg['From'] = 'email patcher' |
15522
cf0f3cb8a332
tests: don't use stdout redirection for test data
Mads Kiilerich <mads@kiilerich.com>
parents:
15462
diff
changeset
|
355 > file(sys.argv[2], 'wb').write(msg.as_string()) |
11807
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
356 > EOF |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
357 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
358 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
359 plain diff in email, [PATCH] subject, message body with subject |
2513
f22e3e8fd457
import: added tests, fixed bugs found by tests and asak.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
360 |
11807
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
361 $ hg clone -r0 a b |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
362 adding changesets |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
363 adding manifests |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
364 adding file changes |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
365 added 1 changesets with 2 changes to 2 files |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
366 updating to branch default |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
367 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
15522
cf0f3cb8a332
tests: don't use stdout redirection for test data
Mads Kiilerich <mads@kiilerich.com>
parents:
15462
diff
changeset
|
368 $ python mkmsg2.py diffed-tip.patch msg.patch |
cf0f3cb8a332
tests: don't use stdout redirection for test data
Mads Kiilerich <mads@kiilerich.com>
parents:
15462
diff
changeset
|
369 $ cat msg.patch | hg --cwd b import - |
11807
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
370 applying patch from stdin |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
371 $ hg --cwd b tip --template '{desc}\n' |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
372 email patch |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
373 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
374 next line |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
375 $ rm -r b |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
376 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
377 |
12399
4fee1fd3de9a
tests: added a short description to issue numbers
Martin Geisler <mg@aragost.com>
parents:
12366
diff
changeset
|
378 Issue963: Parent of working dir incorrect after import of multiple |
4fee1fd3de9a
tests: added a short description to issue numbers
Martin Geisler <mg@aragost.com>
parents:
12366
diff
changeset
|
379 patches and rollback |
4fee1fd3de9a
tests: added a short description to issue numbers
Martin Geisler <mg@aragost.com>
parents:
12366
diff
changeset
|
380 |
4fee1fd3de9a
tests: added a short description to issue numbers
Martin Geisler <mg@aragost.com>
parents:
12366
diff
changeset
|
381 We weren't backing up the correct dirstate file when importing many |
4fee1fd3de9a
tests: added a short description to issue numbers
Martin Geisler <mg@aragost.com>
parents:
12366
diff
changeset
|
382 patches: import patch1 patch2; rollback |
4779
a7915f79d4cc
Added import test for [PATCH] subject and message body with subject
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4230
diff
changeset
|
383 |
11807
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
384 $ echo line 3 >> a/a |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
385 $ hg --cwd a ci -m'third change' |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
386 $ hg --cwd a export -o '../patch%R' 1 2 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
387 $ hg clone -qr0 a b |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
388 $ hg --cwd b parents --template 'parent: {rev}\n' |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
389 parent: 0 |
15194
0705f2ac79d6
import: simplify status reporting logic (and make it more I18N-friendly)
Greg Ward <greg@gerg.ca>
parents:
14452
diff
changeset
|
390 $ hg --cwd b import -v ../patch1 ../patch2 |
11807
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
391 applying ../patch1 |
15194
0705f2ac79d6
import: simplify status reporting logic (and make it more I18N-friendly)
Greg Ward <greg@gerg.ca>
parents:
14452
diff
changeset
|
392 patching file a |
0705f2ac79d6
import: simplify status reporting logic (and make it more I18N-friendly)
Greg Ward <greg@gerg.ca>
parents:
14452
diff
changeset
|
393 a |
0705f2ac79d6
import: simplify status reporting logic (and make it more I18N-friendly)
Greg Ward <greg@gerg.ca>
parents:
14452
diff
changeset
|
394 created 1d4bd90af0e4 |
11807
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
395 applying ../patch2 |
15194
0705f2ac79d6
import: simplify status reporting logic (and make it more I18N-friendly)
Greg Ward <greg@gerg.ca>
parents:
14452
diff
changeset
|
396 patching file a |
0705f2ac79d6
import: simplify status reporting logic (and make it more I18N-friendly)
Greg Ward <greg@gerg.ca>
parents:
14452
diff
changeset
|
397 a |
0705f2ac79d6
import: simplify status reporting logic (and make it more I18N-friendly)
Greg Ward <greg@gerg.ca>
parents:
14452
diff
changeset
|
398 created 6d019af21222 |
11807
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
399 $ hg --cwd b rollback |
15198
62dc0e7ab092
import: wrap a transaction around the whole command
Greg Ward <greg@gerg.ca>
parents:
15194
diff
changeset
|
400 repository tip rolled back to revision 0 (undo import) |
62dc0e7ab092
import: wrap a transaction around the whole command
Greg Ward <greg@gerg.ca>
parents:
15194
diff
changeset
|
401 working directory now based on revision 0 |
11807
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
402 $ hg --cwd b parents --template 'parent: {rev}\n' |
15198
62dc0e7ab092
import: wrap a transaction around the whole command
Greg Ward <greg@gerg.ca>
parents:
15194
diff
changeset
|
403 parent: 0 |
11807
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
404 $ rm -r b |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
405 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
406 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
407 importing a patch in a subdirectory failed at the commit stage |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
408 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
409 $ echo line 2 >> a/d1/d2/a |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
410 $ hg --cwd a ci -u someoneelse -d '1 0' -m'subdir change' |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
411 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
412 hg import in a subdirectory |
4779
a7915f79d4cc
Added import test for [PATCH] subject and message body with subject
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4230
diff
changeset
|
413 |
11807
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
414 $ hg clone -r0 a b |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
415 adding changesets |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
416 adding manifests |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
417 adding file changes |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
418 added 1 changesets with 2 changes to 2 files |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
419 updating to branch default |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
420 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
12366
c01dc9087d9a
tests: drop a bunch of sed calls from unified tests
Matt Mackall <mpm@selenic.com>
parents:
12316
diff
changeset
|
421 $ hg --cwd a export tip > tmp |
14125
2852843947da
tests: do not export several times the same patch/diff in test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
13446
diff
changeset
|
422 $ sed -e 's/d1\/d2\///' < tmp > subdir-tip.patch |
11807
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
423 $ dir=`pwd` |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
424 $ cd b/d1/d2 2>&1 > /dev/null |
14125
2852843947da
tests: do not export several times the same patch/diff in test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
13446
diff
changeset
|
425 $ hg import ../../../subdir-tip.patch |
2852843947da
tests: do not export several times the same patch/diff in test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
13446
diff
changeset
|
426 applying ../../../subdir-tip.patch |
11807
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
427 $ cd "$dir" |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
428 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
429 message should be 'subdir change' |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
430 committer should be 'someoneelse' |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
431 |
14125
2852843947da
tests: do not export several times the same patch/diff in test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
13446
diff
changeset
|
432 $ hg --cwd b tip |
2852843947da
tests: do not export several times the same patch/diff in test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
13446
diff
changeset
|
433 changeset: 1:3577f5aea227 |
2852843947da
tests: do not export several times the same patch/diff in test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
13446
diff
changeset
|
434 tag: tip |
11807
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
435 user: someoneelse |
14125
2852843947da
tests: do not export several times the same patch/diff in test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
13446
diff
changeset
|
436 date: Thu Jan 01 00:00:01 1970 +0000 |
2852843947da
tests: do not export several times the same patch/diff in test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
13446
diff
changeset
|
437 summary: subdir change |
2852843947da
tests: do not export several times the same patch/diff in test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
13446
diff
changeset
|
438 |
11807
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
439 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
440 should be empty |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
441 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
442 $ hg --cwd b status |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
443 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
444 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
445 Test fuzziness (ambiguous patch location, fuzz=2) |
4779
a7915f79d4cc
Added import test for [PATCH] subject and message body with subject
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4230
diff
changeset
|
446 |
11807
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
447 $ hg init fuzzy |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
448 $ cd fuzzy |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
449 $ echo line1 > a |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
450 $ echo line0 >> a |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
451 $ echo line3 >> a |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
452 $ hg ci -Am adda |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
453 adding a |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
454 $ echo line1 > a |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
455 $ echo line2 >> a |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
456 $ echo line0 >> a |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
457 $ echo line3 >> a |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
458 $ hg ci -m change a |
14125
2852843947da
tests: do not export several times the same patch/diff in test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
13446
diff
changeset
|
459 $ hg export tip > fuzzy-tip.patch |
11807
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
460 $ hg up -C 0 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
461 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
462 $ echo line1 > a |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
463 $ echo line0 >> a |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
464 $ echo line1 >> a |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
465 $ echo line0 >> a |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
466 $ hg ci -m brancha |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
467 created new head |
14125
2852843947da
tests: do not export several times the same patch/diff in test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
13446
diff
changeset
|
468 $ hg import --no-commit -v fuzzy-tip.patch |
2852843947da
tests: do not export several times the same patch/diff in test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
13446
diff
changeset
|
469 applying fuzzy-tip.patch |
11807
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
470 patching file a |
16124
0e0060bf2f44
patch: fuzz more aggressively to match patch(1) behaviour
Patrick Mezard <patrick@mezard.eu>
parents:
16123
diff
changeset
|
471 Hunk #1 succeeded at 2 with fuzz 1 (offset 0 lines). |
15194
0705f2ac79d6
import: simplify status reporting logic (and make it more I18N-friendly)
Greg Ward <greg@gerg.ca>
parents:
14452
diff
changeset
|
472 applied to working directory |
11807
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
473 $ hg revert -a |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
474 reverting a |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
475 |
12913
0e0a52bd58f9
import: --no-commit should update .hg/last-message.txt
Steve Borho <steve@borho.org>
parents:
12847
diff
changeset
|
476 |
0e0a52bd58f9
import: --no-commit should update .hg/last-message.txt
Steve Borho <steve@borho.org>
parents:
12847
diff
changeset
|
477 import with --no-commit should have written .hg/last-message.txt |
0e0a52bd58f9
import: --no-commit should update .hg/last-message.txt
Steve Borho <steve@borho.org>
parents:
12847
diff
changeset
|
478 |
12945
99f7dc8def34
test-import: workaround for missing newline is no longer needed
Mads Kiilerich <mads@kiilerich.com>
parents:
12914
diff
changeset
|
479 $ cat .hg/last-message.txt |
99f7dc8def34
test-import: workaround for missing newline is no longer needed
Mads Kiilerich <mads@kiilerich.com>
parents:
12914
diff
changeset
|
480 change (no-eol) |
12913
0e0a52bd58f9
import: --no-commit should update .hg/last-message.txt
Steve Borho <steve@borho.org>
parents:
12847
diff
changeset
|
481 |
0e0a52bd58f9
import: --no-commit should update .hg/last-message.txt
Steve Borho <steve@borho.org>
parents:
12847
diff
changeset
|
482 |
11807
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
483 test fuzziness with eol=auto |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
484 |
14125
2852843947da
tests: do not export several times the same patch/diff in test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
13446
diff
changeset
|
485 $ hg --config patch.eol=auto import --no-commit -v fuzzy-tip.patch |
2852843947da
tests: do not export several times the same patch/diff in test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
13446
diff
changeset
|
486 applying fuzzy-tip.patch |
11807
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
487 patching file a |
16124
0e0060bf2f44
patch: fuzz more aggressively to match patch(1) behaviour
Patrick Mezard <patrick@mezard.eu>
parents:
16123
diff
changeset
|
488 Hunk #1 succeeded at 2 with fuzz 1 (offset 0 lines). |
15194
0705f2ac79d6
import: simplify status reporting logic (and make it more I18N-friendly)
Greg Ward <greg@gerg.ca>
parents:
14452
diff
changeset
|
489 applied to working directory |
11807
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
490 $ cd .. |
5548
1fb38ef1f113
test-import: test fuzziness, ambiguous patch locations
Patrick Mezard <pmezard@gmail.com>
parents:
5418
diff
changeset
|
491 |
1fb38ef1f113
test-import: test fuzziness, ambiguous patch locations
Patrick Mezard <pmezard@gmail.com>
parents:
5418
diff
changeset
|
492 |
11807
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
493 Test hunk touching empty files (issue906) |
5852
03ce5a919ae3
patch: handle empty vs no file in git patches (issue906)
Patrick Mezard <pmezard@gmail.com>
parents:
5548
diff
changeset
|
494 |
11807
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
495 $ hg init empty |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
496 $ cd empty |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
497 $ touch a |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
498 $ touch b1 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
499 $ touch c1 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
500 $ echo d > d |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
501 $ hg ci -Am init |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
502 adding a |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
503 adding b1 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
504 adding c1 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
505 adding d |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
506 $ echo a > a |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
507 $ echo b > b1 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
508 $ hg mv b1 b2 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
509 $ echo c > c1 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
510 $ hg copy c1 c2 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
511 $ rm d |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
512 $ touch d |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
513 $ hg diff --git |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
514 diff --git a/a b/a |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
515 --- a/a |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
516 +++ b/a |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
517 @@ -0,0 +1,1 @@ |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
518 +a |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
519 diff --git a/b1 b/b2 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
520 rename from b1 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
521 rename to b2 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
522 --- a/b1 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
523 +++ b/b2 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
524 @@ -0,0 +1,1 @@ |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
525 +b |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
526 diff --git a/c1 b/c1 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
527 --- a/c1 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
528 +++ b/c1 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
529 @@ -0,0 +1,1 @@ |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
530 +c |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
531 diff --git a/c1 b/c2 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
532 copy from c1 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
533 copy to c2 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
534 --- a/c1 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
535 +++ b/c2 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
536 @@ -0,0 +1,1 @@ |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
537 +c |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
538 diff --git a/d b/d |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
539 --- a/d |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
540 +++ b/d |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
541 @@ -1,1 +0,0 @@ |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
542 -d |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
543 $ hg ci -m empty |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
544 $ hg export --git tip > empty.diff |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
545 $ hg up -C 0 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
546 4 files updated, 0 files merged, 2 files removed, 0 files unresolved |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
547 $ hg import empty.diff |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
548 applying empty.diff |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
549 $ for name in a b1 b2 c1 c2 d; do |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
550 > echo % $name file |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
551 > test -f $name && cat $name |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
552 > done |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
553 % a file |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
554 a |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
555 % b1 file |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
556 % b2 file |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
557 b |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
558 % c1 file |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
559 c |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
560 % c2 file |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
561 c |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
562 % d file |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
563 $ cd .. |
5852
03ce5a919ae3
patch: handle empty vs no file in git patches (issue906)
Patrick Mezard <pmezard@gmail.com>
parents:
5548
diff
changeset
|
564 |
11807
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
565 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
566 Test importing a patch ending with a binary file removal |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
567 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
568 $ hg init binaryremoval |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
569 $ cd binaryremoval |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
570 $ echo a > a |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
571 $ python -c "file('b', 'wb').write('a\x00b')" |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
572 $ hg ci -Am addall |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
573 adding a |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
574 adding b |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
575 $ hg rm a |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
576 $ hg rm b |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
577 $ hg st |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
578 R a |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
579 R b |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
580 $ hg ci -m remove |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
581 $ hg export --git . > remove.diff |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
582 $ cat remove.diff | grep git |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
583 diff --git a/a b/a |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
584 diff --git a/b b/b |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
585 $ hg up -C 0 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
586 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
587 $ hg import remove.diff |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
588 applying remove.diff |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
589 $ hg manifest |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
590 $ cd .. |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
591 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
592 |
12399
4fee1fd3de9a
tests: added a short description to issue numbers
Martin Geisler <mg@aragost.com>
parents:
12366
diff
changeset
|
593 Issue927: test update+rename with common name |
6179
36ab165abbe2
patch: fix iterhunks() with trailing binary file removal
Patrick Mezard <pmezard@gmail.com>
parents:
6001
diff
changeset
|
594 |
11807
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
595 $ hg init t |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
596 $ cd t |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
597 $ touch a |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
598 $ hg ci -Am t |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
599 adding a |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
600 $ echo a > a |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
601 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
602 Here, bfile.startswith(afile) |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
603 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
604 $ hg copy a a2 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
605 $ hg ci -m copya |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
606 $ hg export --git tip > copy.diff |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
607 $ hg up -C 0 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
608 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
609 $ hg import copy.diff |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
610 applying copy.diff |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
611 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
612 a should contain an 'a' |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
613 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
614 $ cat a |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
615 a |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
616 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
617 and a2 should have duplicated it |
6520
ba0b2dacc623
fix import with -p0
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
6295
diff
changeset
|
618 |
11807
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
619 $ cat a2 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
620 a |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
621 $ cd .. |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
622 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
623 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
624 test -p0 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
625 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
626 $ hg init p0 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
627 $ cd p0 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
628 $ echo a > a |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
629 $ hg ci -Am t |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
630 adding a |
17712
c4717f44c1f1
fancyopts: don't show a traceback on invalid integer values
Idan Kamara <idankk86@gmail.com>
parents:
16912
diff
changeset
|
631 $ hg import -p foo |
c4717f44c1f1
fancyopts: don't show a traceback on invalid integer values
Idan Kamara <idankk86@gmail.com>
parents:
16912
diff
changeset
|
632 abort: invalid value 'foo' for option -p, expected int |
c4717f44c1f1
fancyopts: don't show a traceback on invalid integer values
Idan Kamara <idankk86@gmail.com>
parents:
16912
diff
changeset
|
633 [255] |
11807
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
634 $ hg import -p0 - << EOF |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
635 > foobar |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
636 > --- a Sat Apr 12 22:43:58 2008 -0400 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
637 > +++ a Sat Apr 12 22:44:05 2008 -0400 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
638 > @@ -1,1 +1,1 @@ |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
639 > -a |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
640 > +bb |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
641 > EOF |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
642 applying patch from stdin |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
643 $ hg status |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
644 $ cat a |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
645 bb |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
646 $ cd .. |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
647 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
648 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
649 test paths outside repo root |
6758
87c704ac92d4
Check that git patches only touch files under root
Brendan Cully <brendan@kublai.com>
parents:
6520
diff
changeset
|
650 |
11807
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
651 $ mkdir outside |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
652 $ touch outside/foo |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
653 $ hg init inside |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
654 $ cd inside |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
655 $ hg import - <<EOF |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
656 > diff --git a/a b/b |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
657 > rename from ../outside/foo |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
658 > rename to bar |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
659 > EOF |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
660 applying patch from stdin |
16889
0074c2babb13
test-import: enable for Windows
Adrian Buehlmann <adrian@cadifra.com>
parents:
16888
diff
changeset
|
661 abort: path contains illegal component: ../outside/foo (glob) |
12316
4134686b83e1
tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents:
11807
diff
changeset
|
662 [255] |
11807
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
663 $ cd .. |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
664 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
665 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
666 test import with similarity and git and strip (issue295 et al.) |
7402
bffdab64dfbb
import: add similarity option (issue295)
Brendan Cully <brendan@kublai.com>
parents:
7247
diff
changeset
|
667 |
11807
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
668 $ hg init sim |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
669 $ cd sim |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
670 $ echo 'this is a test' > a |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
671 $ hg ci -Ama |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
672 adding a |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
673 $ cat > ../rename.diff <<EOF |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
674 > diff --git a/foo/a b/foo/a |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
675 > deleted file mode 100644 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
676 > --- a/foo/a |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
677 > +++ /dev/null |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
678 > @@ -1,1 +0,0 @@ |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
679 > -this is a test |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
680 > diff --git a/foo/b b/foo/b |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
681 > new file mode 100644 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
682 > --- /dev/null |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
683 > +++ b/foo/b |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
684 > @@ -0,0 +1,2 @@ |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
685 > +this is a test |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
686 > +foo |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
687 > EOF |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
688 $ hg import --no-commit -v -s 1 ../rename.diff -p2 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
689 applying ../rename.diff |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
690 patching file a |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
691 patching file b |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
692 adding b |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
693 recording removal of a as rename to b (88% similar) |
15194
0705f2ac79d6
import: simplify status reporting logic (and make it more I18N-friendly)
Greg Ward <greg@gerg.ca>
parents:
14452
diff
changeset
|
694 applied to working directory |
11807
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
695 $ hg st -C |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
696 A b |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
697 a |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
698 R a |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
699 $ hg revert -a |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
700 undeleting a |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
701 forgetting b |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
702 $ rm b |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
703 $ hg import --no-commit -v -s 100 ../rename.diff -p2 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
704 applying ../rename.diff |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
705 patching file a |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
706 patching file b |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
707 adding b |
15194
0705f2ac79d6
import: simplify status reporting logic (and make it more I18N-friendly)
Greg Ward <greg@gerg.ca>
parents:
14452
diff
changeset
|
708 applied to working directory |
11807
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
709 $ hg st -C |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
710 A b |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
711 R a |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
712 $ cd .. |
7971
6ea0318daf75
Fix issue1495, corner case of adding empty files via patching
Vsevolod Solovyov <vsevolod.solovyov@gmail.com>
parents:
7402
diff
changeset
|
713 |
6ea0318daf75
Fix issue1495, corner case of adding empty files via patching
Vsevolod Solovyov <vsevolod.solovyov@gmail.com>
parents:
7402
diff
changeset
|
714 |
12399
4fee1fd3de9a
tests: added a short description to issue numbers
Martin Geisler <mg@aragost.com>
parents:
12366
diff
changeset
|
715 Issue1495: add empty file from the end of patch |
11807
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
716 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
717 $ hg init addemptyend |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
718 $ cd addemptyend |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
719 $ touch a |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
720 $ hg addremove |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
721 adding a |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
722 $ hg ci -m "commit" |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
723 $ cat > a.patch <<EOF |
15198
62dc0e7ab092
import: wrap a transaction around the whole command
Greg Ward <greg@gerg.ca>
parents:
15194
diff
changeset
|
724 > add a, b |
11807
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
725 > diff --git a/a b/a |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
726 > --- a/a |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
727 > +++ b/a |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
728 > @@ -0,0 +1,1 @@ |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
729 > +a |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
730 > diff --git a/b b/b |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
731 > new file mode 100644 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
732 > EOF |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
733 $ hg import --no-commit a.patch |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
734 applying a.patch |
15198
62dc0e7ab092
import: wrap a transaction around the whole command
Greg Ward <greg@gerg.ca>
parents:
15194
diff
changeset
|
735 |
62dc0e7ab092
import: wrap a transaction around the whole command
Greg Ward <greg@gerg.ca>
parents:
15194
diff
changeset
|
736 apply a good patch followed by an empty patch (mainly to ensure |
62dc0e7ab092
import: wrap a transaction around the whole command
Greg Ward <greg@gerg.ca>
parents:
15194
diff
changeset
|
737 that dirstate is *not* updated when import crashes) |
62dc0e7ab092
import: wrap a transaction around the whole command
Greg Ward <greg@gerg.ca>
parents:
15194
diff
changeset
|
738 $ hg update -q -C . |
62dc0e7ab092
import: wrap a transaction around the whole command
Greg Ward <greg@gerg.ca>
parents:
15194
diff
changeset
|
739 $ rm b |
62dc0e7ab092
import: wrap a transaction around the whole command
Greg Ward <greg@gerg.ca>
parents:
15194
diff
changeset
|
740 $ touch empty.patch |
62dc0e7ab092
import: wrap a transaction around the whole command
Greg Ward <greg@gerg.ca>
parents:
15194
diff
changeset
|
741 $ hg import a.patch empty.patch |
62dc0e7ab092
import: wrap a transaction around the whole command
Greg Ward <greg@gerg.ca>
parents:
15194
diff
changeset
|
742 applying a.patch |
62dc0e7ab092
import: wrap a transaction around the whole command
Greg Ward <greg@gerg.ca>
parents:
15194
diff
changeset
|
743 applying empty.patch |
62dc0e7ab092
import: wrap a transaction around the whole command
Greg Ward <greg@gerg.ca>
parents:
15194
diff
changeset
|
744 transaction abort! |
62dc0e7ab092
import: wrap a transaction around the whole command
Greg Ward <greg@gerg.ca>
parents:
15194
diff
changeset
|
745 rollback completed |
62dc0e7ab092
import: wrap a transaction around the whole command
Greg Ward <greg@gerg.ca>
parents:
15194
diff
changeset
|
746 abort: empty.patch: no diffs found |
62dc0e7ab092
import: wrap a transaction around the whole command
Greg Ward <greg@gerg.ca>
parents:
15194
diff
changeset
|
747 [255] |
62dc0e7ab092
import: wrap a transaction around the whole command
Greg Ward <greg@gerg.ca>
parents:
15194
diff
changeset
|
748 $ hg tip --template '{rev} {desc|firstline}\n' |
62dc0e7ab092
import: wrap a transaction around the whole command
Greg Ward <greg@gerg.ca>
parents:
15194
diff
changeset
|
749 0 commit |
62dc0e7ab092
import: wrap a transaction around the whole command
Greg Ward <greg@gerg.ca>
parents:
15194
diff
changeset
|
750 $ hg -q status |
62dc0e7ab092
import: wrap a transaction around the whole command
Greg Ward <greg@gerg.ca>
parents:
15194
diff
changeset
|
751 M a |
11807
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
752 $ cd .. |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
753 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
754 create file when source is not /dev/null |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
755 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
756 $ cat > create.patch <<EOF |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
757 > diff -Naur proj-orig/foo proj-new/foo |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
758 > --- proj-orig/foo 1969-12-31 16:00:00.000000000 -0800 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
759 > +++ proj-new/foo 2009-07-17 16:50:45.801368000 -0700 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
760 > @@ -0,0 +1,1 @@ |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
761 > +a |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
762 > EOF |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
763 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
764 some people have patches like the following too |
9573
b8352a3617f3
patch: do not swallow header-like patch first line (issue1859)
Patrick Mezard <pmezard@gmail.com>
parents:
8523
diff
changeset
|
765 |
11807
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
766 $ cat > create2.patch <<EOF |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
767 > diff -Naur proj-orig/foo proj-new/foo |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
768 > --- proj-orig/foo.orig 1969-12-31 16:00:00.000000000 -0800 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
769 > +++ proj-new/foo 2009-07-17 16:50:45.801368000 -0700 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
770 > @@ -0,0 +1,1 @@ |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
771 > +a |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
772 > EOF |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
773 $ hg init oddcreate |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
774 $ cd oddcreate |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
775 $ hg import --no-commit ../create.patch |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
776 applying ../create.patch |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
777 $ cat foo |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
778 a |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
779 $ rm foo |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
780 $ hg revert foo |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
781 $ hg import --no-commit ../create2.patch |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
782 applying ../create2.patch |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
783 $ cat foo |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
784 a |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
785 |
16912
6ef3107c661e
tests: cleanup of tests that got lost in their own nested directories
Mads Kiilerich <mads@kiilerich.com>
parents:
16889
diff
changeset
|
786 $ cd .. |
11807
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
787 |
12399
4fee1fd3de9a
tests: added a short description to issue numbers
Martin Geisler <mg@aragost.com>
parents:
12366
diff
changeset
|
788 Issue1859: first line mistaken for email headers |
9576 | 789 |
11807
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
790 $ hg init emailconfusion |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
791 $ cd emailconfusion |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
792 $ cat > a.patch <<EOF |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
793 > module: summary |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
794 > |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
795 > description |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
796 > |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
797 > |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
798 > diff -r 000000000000 -r 9b4c1e343b55 test.txt |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
799 > --- /dev/null |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
800 > +++ b/a |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
801 > @@ -0,0 +1,1 @@ |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
802 > +a |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
803 > EOF |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
804 $ hg import -d '0 0' a.patch |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
805 applying a.patch |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
806 $ hg parents -v |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
807 changeset: 0:5a681217c0ad |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
808 tag: tip |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
809 user: test |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
810 date: Thu Jan 01 00:00:00 1970 +0000 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
811 files: a |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
812 description: |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
813 module: summary |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
814 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
815 description |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
816 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
817 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
818 $ cd .. |
9573
b8352a3617f3
patch: do not swallow header-like patch first line (issue1859)
Patrick Mezard <pmezard@gmail.com>
parents:
8523
diff
changeset
|
819 |
b8352a3617f3
patch: do not swallow header-like patch first line (issue1859)
Patrick Mezard <pmezard@gmail.com>
parents:
8523
diff
changeset
|
820 |
16912
6ef3107c661e
tests: cleanup of tests that got lost in their own nested directories
Mads Kiilerich <mads@kiilerich.com>
parents:
16889
diff
changeset
|
821 in commit message |
10729
7a5931c5f2dc
patch: enhance diff detection regexp, allow '--- ' in patch message
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
10524
diff
changeset
|
822 |
11807
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
823 $ hg init commitconfusion |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
824 $ cd commitconfusion |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
825 $ cat > a.patch <<EOF |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
826 > module: summary |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
827 > |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
828 > --- description |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
829 > |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
830 > diff --git a/a b/a |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
831 > new file mode 100644 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
832 > --- /dev/null |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
833 > +++ b/a |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
834 > @@ -0,0 +1,1 @@ |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
835 > +a |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
836 > EOF |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
837 > hg import -d '0 0' a.patch |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
838 > hg parents -v |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
839 > cd .. |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
840 > |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
841 > echo '% tricky header splitting' |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
842 > cat > trickyheaders.patch <<EOF |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
843 > From: User A <user@a> |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
844 > Subject: [PATCH] from: tricky! |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
845 > |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
846 > # HG changeset patch |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
847 > # User User B |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
848 > # Date 1266264441 18000 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
849 > # Branch stable |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
850 > # Node ID f2be6a1170ac83bf31cb4ae0bad00d7678115bc0 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
851 > # Parent 0000000000000000000000000000000000000000 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
852 > from: tricky! |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
853 > |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
854 > That is not a header. |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
855 > |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
856 > diff -r 000000000000 -r f2be6a1170ac foo |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
857 > --- /dev/null |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
858 > +++ b/foo |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
859 > @@ -0,0 +1,1 @@ |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
860 > +foo |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
861 > EOF |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
862 applying a.patch |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
863 changeset: 0:f34d9187897d |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
864 tag: tip |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
865 user: test |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
866 date: Thu Jan 01 00:00:00 1970 +0000 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
867 files: a |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
868 description: |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
869 module: summary |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
870 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
871 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
872 % tricky header splitting |
10501
a27af7229850
import: if in doubt, consume stream until start of diff
Brendan Cully <brendan@kublai.com>
parents:
10384
diff
changeset
|
873 |
11807
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
874 $ hg init trickyheaders |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
875 $ cd trickyheaders |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
876 $ hg import -d '0 0' ../trickyheaders.patch |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
877 applying ../trickyheaders.patch |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
878 $ hg export --git tip |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
879 # HG changeset patch |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
880 # User User B |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
881 # Date 0 0 |
18648
76b69cccb07a
export: show 'Date' header in a format that also is readable for humans
Mads Kiilerich <mads@kiilerich.com>
parents:
17712
diff
changeset
|
882 # Thu Jan 01 00:00:00 1970 +0000 |
11807
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
883 # Node ID eb56ab91903632294ac504838508cb370c0901d2 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
884 # Parent 0000000000000000000000000000000000000000 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
885 from: tricky! |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
886 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
887 That is not a header. |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
888 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
889 diff --git a/foo b/foo |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
890 new file mode 100644 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
891 --- /dev/null |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
892 +++ b/foo |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
893 @@ -0,0 +1,1 @@ |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
894 +foo |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
895 $ cd .. |
10501
a27af7229850
import: if in doubt, consume stream until start of diff
Brendan Cully <brendan@kublai.com>
parents:
10384
diff
changeset
|
896 |
a27af7229850
import: if in doubt, consume stream until start of diff
Brendan Cully <brendan@kublai.com>
parents:
10384
diff
changeset
|
897 |
12399
4fee1fd3de9a
tests: added a short description to issue numbers
Martin Geisler <mg@aragost.com>
parents:
12366
diff
changeset
|
898 Issue2102: hg export and hg import speak different languages |
10748
fb06e357e698
patch: more precise NoHunk, raised for every file (issue2102)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
10745
diff
changeset
|
899 |
11807
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
900 $ hg init issue2102 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
901 $ cd issue2102 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
902 $ mkdir -p src/cmd/gc |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
903 $ touch src/cmd/gc/mksys.bash |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
904 $ hg ci -Am init |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
905 adding src/cmd/gc/mksys.bash |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
906 $ hg import - <<EOF |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
907 > # HG changeset patch |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
908 > # User Rob Pike |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
909 > # Date 1216685449 25200 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
910 > # Node ID 03aa2b206f499ad6eb50e6e207b9e710d6409c98 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
911 > # Parent 93d10138ad8df586827ca90b4ddb5033e21a3a84 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
912 > help management of empty pkg and lib directories in perforce |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
913 > |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
914 > R=gri |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
915 > DELTA=4 (4 added, 0 deleted, 0 changed) |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
916 > OCL=13328 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
917 > CL=13328 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
918 > |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
919 > diff --git a/lib/place-holder b/lib/place-holder |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
920 > new file mode 100644 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
921 > --- /dev/null |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
922 > +++ b/lib/place-holder |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
923 > @@ -0,0 +1,2 @@ |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
924 > +perforce does not maintain empty directories. |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
925 > +this file helps. |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
926 > diff --git a/pkg/place-holder b/pkg/place-holder |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
927 > new file mode 100644 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
928 > --- /dev/null |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
929 > +++ b/pkg/place-holder |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
930 > @@ -0,0 +1,2 @@ |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
931 > +perforce does not maintain empty directories. |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
932 > +this file helps. |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
933 > diff --git a/src/cmd/gc/mksys.bash b/src/cmd/gc/mksys.bash |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
934 > old mode 100644 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
935 > new mode 100755 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
936 > EOF |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
937 applying patch from stdin |
16889
0074c2babb13
test-import: enable for Windows
Adrian Buehlmann <adrian@cadifra.com>
parents:
16888
diff
changeset
|
938 |
0074c2babb13
test-import: enable for Windows
Adrian Buehlmann <adrian@cadifra.com>
parents:
16888
diff
changeset
|
939 #if execbit |
0074c2babb13
test-import: enable for Windows
Adrian Buehlmann <adrian@cadifra.com>
parents:
16888
diff
changeset
|
940 |
11807
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
941 $ hg sum |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
942 parent: 1:d59915696727 tip |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
943 help management of empty pkg and lib directories in perforce |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
944 branch: default |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
945 commit: (clean) |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
946 update: (current) |
16889
0074c2babb13
test-import: enable for Windows
Adrian Buehlmann <adrian@cadifra.com>
parents:
16888
diff
changeset
|
947 |
11807
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
948 $ hg diff --git -c tip |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
949 diff --git a/lib/place-holder b/lib/place-holder |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
950 new file mode 100644 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
951 --- /dev/null |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
952 +++ b/lib/place-holder |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
953 @@ -0,0 +1,2 @@ |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
954 +perforce does not maintain empty directories. |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
955 +this file helps. |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
956 diff --git a/pkg/place-holder b/pkg/place-holder |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
957 new file mode 100644 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
958 --- /dev/null |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
959 +++ b/pkg/place-holder |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
960 @@ -0,0 +1,2 @@ |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
961 +perforce does not maintain empty directories. |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
962 +this file helps. |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
963 diff --git a/src/cmd/gc/mksys.bash b/src/cmd/gc/mksys.bash |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
964 old mode 100644 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
965 new mode 100755 |
16889
0074c2babb13
test-import: enable for Windows
Adrian Buehlmann <adrian@cadifra.com>
parents:
16888
diff
changeset
|
966 |
0074c2babb13
test-import: enable for Windows
Adrian Buehlmann <adrian@cadifra.com>
parents:
16888
diff
changeset
|
967 #else |
0074c2babb13
test-import: enable for Windows
Adrian Buehlmann <adrian@cadifra.com>
parents:
16888
diff
changeset
|
968 |
0074c2babb13
test-import: enable for Windows
Adrian Buehlmann <adrian@cadifra.com>
parents:
16888
diff
changeset
|
969 $ hg sum |
0074c2babb13
test-import: enable for Windows
Adrian Buehlmann <adrian@cadifra.com>
parents:
16888
diff
changeset
|
970 parent: 1:28f089cc9ccc tip |
0074c2babb13
test-import: enable for Windows
Adrian Buehlmann <adrian@cadifra.com>
parents:
16888
diff
changeset
|
971 help management of empty pkg and lib directories in perforce |
0074c2babb13
test-import: enable for Windows
Adrian Buehlmann <adrian@cadifra.com>
parents:
16888
diff
changeset
|
972 branch: default |
0074c2babb13
test-import: enable for Windows
Adrian Buehlmann <adrian@cadifra.com>
parents:
16888
diff
changeset
|
973 commit: (clean) |
0074c2babb13
test-import: enable for Windows
Adrian Buehlmann <adrian@cadifra.com>
parents:
16888
diff
changeset
|
974 update: (current) |
0074c2babb13
test-import: enable for Windows
Adrian Buehlmann <adrian@cadifra.com>
parents:
16888
diff
changeset
|
975 |
0074c2babb13
test-import: enable for Windows
Adrian Buehlmann <adrian@cadifra.com>
parents:
16888
diff
changeset
|
976 $ hg diff --git -c tip |
0074c2babb13
test-import: enable for Windows
Adrian Buehlmann <adrian@cadifra.com>
parents:
16888
diff
changeset
|
977 diff --git a/lib/place-holder b/lib/place-holder |
0074c2babb13
test-import: enable for Windows
Adrian Buehlmann <adrian@cadifra.com>
parents:
16888
diff
changeset
|
978 new file mode 100644 |
0074c2babb13
test-import: enable for Windows
Adrian Buehlmann <adrian@cadifra.com>
parents:
16888
diff
changeset
|
979 --- /dev/null |
0074c2babb13
test-import: enable for Windows
Adrian Buehlmann <adrian@cadifra.com>
parents:
16888
diff
changeset
|
980 +++ b/lib/place-holder |
0074c2babb13
test-import: enable for Windows
Adrian Buehlmann <adrian@cadifra.com>
parents:
16888
diff
changeset
|
981 @@ -0,0 +1,2 @@ |
0074c2babb13
test-import: enable for Windows
Adrian Buehlmann <adrian@cadifra.com>
parents:
16888
diff
changeset
|
982 +perforce does not maintain empty directories. |
0074c2babb13
test-import: enable for Windows
Adrian Buehlmann <adrian@cadifra.com>
parents:
16888
diff
changeset
|
983 +this file helps. |
0074c2babb13
test-import: enable for Windows
Adrian Buehlmann <adrian@cadifra.com>
parents:
16888
diff
changeset
|
984 diff --git a/pkg/place-holder b/pkg/place-holder |
0074c2babb13
test-import: enable for Windows
Adrian Buehlmann <adrian@cadifra.com>
parents:
16888
diff
changeset
|
985 new file mode 100644 |
0074c2babb13
test-import: enable for Windows
Adrian Buehlmann <adrian@cadifra.com>
parents:
16888
diff
changeset
|
986 --- /dev/null |
0074c2babb13
test-import: enable for Windows
Adrian Buehlmann <adrian@cadifra.com>
parents:
16888
diff
changeset
|
987 +++ b/pkg/place-holder |
0074c2babb13
test-import: enable for Windows
Adrian Buehlmann <adrian@cadifra.com>
parents:
16888
diff
changeset
|
988 @@ -0,0 +1,2 @@ |
0074c2babb13
test-import: enable for Windows
Adrian Buehlmann <adrian@cadifra.com>
parents:
16888
diff
changeset
|
989 +perforce does not maintain empty directories. |
0074c2babb13
test-import: enable for Windows
Adrian Buehlmann <adrian@cadifra.com>
parents:
16888
diff
changeset
|
990 +this file helps. |
0074c2babb13
test-import: enable for Windows
Adrian Buehlmann <adrian@cadifra.com>
parents:
16888
diff
changeset
|
991 |
0074c2babb13
test-import: enable for Windows
Adrian Buehlmann <adrian@cadifra.com>
parents:
16888
diff
changeset
|
992 /* The mode change for mksys.bash is missing here, because on platforms */ |
0074c2babb13
test-import: enable for Windows
Adrian Buehlmann <adrian@cadifra.com>
parents:
16888
diff
changeset
|
993 /* that don't support execbits, mode changes in patches are ignored when */ |
0074c2babb13
test-import: enable for Windows
Adrian Buehlmann <adrian@cadifra.com>
parents:
16888
diff
changeset
|
994 /* they are imported. This is obviously also the reason for why the hash */ |
0074c2babb13
test-import: enable for Windows
Adrian Buehlmann <adrian@cadifra.com>
parents:
16888
diff
changeset
|
995 /* in the created changeset is different to the one you see above the */ |
0074c2babb13
test-import: enable for Windows
Adrian Buehlmann <adrian@cadifra.com>
parents:
16888
diff
changeset
|
996 /* #else clause */ |
0074c2babb13
test-import: enable for Windows
Adrian Buehlmann <adrian@cadifra.com>
parents:
16888
diff
changeset
|
997 |
0074c2babb13
test-import: enable for Windows
Adrian Buehlmann <adrian@cadifra.com>
parents:
16888
diff
changeset
|
998 #endif |
11807
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
999 $ cd .. |
10748
fb06e357e698
patch: more precise NoHunk, raised for every file (issue2102)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
10745
diff
changeset
|
1000 |
11807
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
1001 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
1002 diff lines looking like headers |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
1003 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
1004 $ hg init difflineslikeheaders |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
1005 $ cd difflineslikeheaders |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
1006 $ echo a >a |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
1007 $ echo b >b |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
1008 $ echo c >c |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
1009 $ hg ci -Am1 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
1010 adding a |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
1011 adding b |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
1012 adding c |
10883
196908117c27
patch: don't look for headers in diff lines
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
10775
diff
changeset
|
1013 |
11807
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
1014 $ echo "key: value" >>a |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
1015 $ echo "key: value" >>b |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
1016 $ echo "foo" >>c |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
1017 $ hg ci -m2 |
10883
196908117c27
patch: don't look for headers in diff lines
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
10775
diff
changeset
|
1018 |
11807
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
1019 $ hg up -C 0 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
1020 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
1021 $ hg diff --git -c1 >want |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
1022 $ hg diff -c1 | hg import --no-commit - |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
1023 applying patch from stdin |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
1024 $ hg diff --git >have |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
1025 $ diff want have |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
1026 $ cd .. |
10883
196908117c27
patch: don't look for headers in diff lines
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
10775
diff
changeset
|
1027 |
15462
2b1ec74c961f
mdiff/patch: fix bad hunk handling for unified diffs with zero context
Nicolas Venegas <nvenegas@atlassian.com>
parents:
15327
diff
changeset
|
1028 import a unified diff with no lines of context (diff -U0) |
2b1ec74c961f
mdiff/patch: fix bad hunk handling for unified diffs with zero context
Nicolas Venegas <nvenegas@atlassian.com>
parents:
15327
diff
changeset
|
1029 |
2b1ec74c961f
mdiff/patch: fix bad hunk handling for unified diffs with zero context
Nicolas Venegas <nvenegas@atlassian.com>
parents:
15327
diff
changeset
|
1030 $ hg init diffzero |
2b1ec74c961f
mdiff/patch: fix bad hunk handling for unified diffs with zero context
Nicolas Venegas <nvenegas@atlassian.com>
parents:
15327
diff
changeset
|
1031 $ cd diffzero |
2b1ec74c961f
mdiff/patch: fix bad hunk handling for unified diffs with zero context
Nicolas Venegas <nvenegas@atlassian.com>
parents:
15327
diff
changeset
|
1032 $ cat > f << EOF |
2b1ec74c961f
mdiff/patch: fix bad hunk handling for unified diffs with zero context
Nicolas Venegas <nvenegas@atlassian.com>
parents:
15327
diff
changeset
|
1033 > c2 |
2b1ec74c961f
mdiff/patch: fix bad hunk handling for unified diffs with zero context
Nicolas Venegas <nvenegas@atlassian.com>
parents:
15327
diff
changeset
|
1034 > c4 |
2b1ec74c961f
mdiff/patch: fix bad hunk handling for unified diffs with zero context
Nicolas Venegas <nvenegas@atlassian.com>
parents:
15327
diff
changeset
|
1035 > c5 |
2b1ec74c961f
mdiff/patch: fix bad hunk handling for unified diffs with zero context
Nicolas Venegas <nvenegas@atlassian.com>
parents:
15327
diff
changeset
|
1036 > EOF |
2b1ec74c961f
mdiff/patch: fix bad hunk handling for unified diffs with zero context
Nicolas Venegas <nvenegas@atlassian.com>
parents:
15327
diff
changeset
|
1037 $ hg commit -Am0 |
2b1ec74c961f
mdiff/patch: fix bad hunk handling for unified diffs with zero context
Nicolas Venegas <nvenegas@atlassian.com>
parents:
15327
diff
changeset
|
1038 adding f |
2b1ec74c961f
mdiff/patch: fix bad hunk handling for unified diffs with zero context
Nicolas Venegas <nvenegas@atlassian.com>
parents:
15327
diff
changeset
|
1039 |
2b1ec74c961f
mdiff/patch: fix bad hunk handling for unified diffs with zero context
Nicolas Venegas <nvenegas@atlassian.com>
parents:
15327
diff
changeset
|
1040 $ hg import --no-commit - << EOF |
2b1ec74c961f
mdiff/patch: fix bad hunk handling for unified diffs with zero context
Nicolas Venegas <nvenegas@atlassian.com>
parents:
15327
diff
changeset
|
1041 > # HG changeset patch |
2b1ec74c961f
mdiff/patch: fix bad hunk handling for unified diffs with zero context
Nicolas Venegas <nvenegas@atlassian.com>
parents:
15327
diff
changeset
|
1042 > # User test |
2b1ec74c961f
mdiff/patch: fix bad hunk handling for unified diffs with zero context
Nicolas Venegas <nvenegas@atlassian.com>
parents:
15327
diff
changeset
|
1043 > # Date 0 0 |
2b1ec74c961f
mdiff/patch: fix bad hunk handling for unified diffs with zero context
Nicolas Venegas <nvenegas@atlassian.com>
parents:
15327
diff
changeset
|
1044 > # Node ID f4974ab632f3dee767567b0576c0ec9a4508575c |
2b1ec74c961f
mdiff/patch: fix bad hunk handling for unified diffs with zero context
Nicolas Venegas <nvenegas@atlassian.com>
parents:
15327
diff
changeset
|
1045 > # Parent 8679a12a975b819fae5f7ad3853a2886d143d794 |
2b1ec74c961f
mdiff/patch: fix bad hunk handling for unified diffs with zero context
Nicolas Venegas <nvenegas@atlassian.com>
parents:
15327
diff
changeset
|
1046 > 1 |
2b1ec74c961f
mdiff/patch: fix bad hunk handling for unified diffs with zero context
Nicolas Venegas <nvenegas@atlassian.com>
parents:
15327
diff
changeset
|
1047 > diff -r 8679a12a975b -r f4974ab632f3 f |
2b1ec74c961f
mdiff/patch: fix bad hunk handling for unified diffs with zero context
Nicolas Venegas <nvenegas@atlassian.com>
parents:
15327
diff
changeset
|
1048 > --- a/f Thu Jan 01 00:00:00 1970 +0000 |
2b1ec74c961f
mdiff/patch: fix bad hunk handling for unified diffs with zero context
Nicolas Venegas <nvenegas@atlassian.com>
parents:
15327
diff
changeset
|
1049 > +++ b/f Thu Jan 01 00:00:00 1970 +0000 |
2b1ec74c961f
mdiff/patch: fix bad hunk handling for unified diffs with zero context
Nicolas Venegas <nvenegas@atlassian.com>
parents:
15327
diff
changeset
|
1050 > @@ -0,0 +1,1 @@ |
2b1ec74c961f
mdiff/patch: fix bad hunk handling for unified diffs with zero context
Nicolas Venegas <nvenegas@atlassian.com>
parents:
15327
diff
changeset
|
1051 > +c1 |
2b1ec74c961f
mdiff/patch: fix bad hunk handling for unified diffs with zero context
Nicolas Venegas <nvenegas@atlassian.com>
parents:
15327
diff
changeset
|
1052 > @@ -1,0 +3,1 @@ |
2b1ec74c961f
mdiff/patch: fix bad hunk handling for unified diffs with zero context
Nicolas Venegas <nvenegas@atlassian.com>
parents:
15327
diff
changeset
|
1053 > +c3 |
2b1ec74c961f
mdiff/patch: fix bad hunk handling for unified diffs with zero context
Nicolas Venegas <nvenegas@atlassian.com>
parents:
15327
diff
changeset
|
1054 > @@ -3,1 +4,0 @@ |
2b1ec74c961f
mdiff/patch: fix bad hunk handling for unified diffs with zero context
Nicolas Venegas <nvenegas@atlassian.com>
parents:
15327
diff
changeset
|
1055 > -c5 |
2b1ec74c961f
mdiff/patch: fix bad hunk handling for unified diffs with zero context
Nicolas Venegas <nvenegas@atlassian.com>
parents:
15327
diff
changeset
|
1056 > EOF |
2b1ec74c961f
mdiff/patch: fix bad hunk handling for unified diffs with zero context
Nicolas Venegas <nvenegas@atlassian.com>
parents:
15327
diff
changeset
|
1057 applying patch from stdin |
2b1ec74c961f
mdiff/patch: fix bad hunk handling for unified diffs with zero context
Nicolas Venegas <nvenegas@atlassian.com>
parents:
15327
diff
changeset
|
1058 |
2b1ec74c961f
mdiff/patch: fix bad hunk handling for unified diffs with zero context
Nicolas Venegas <nvenegas@atlassian.com>
parents:
15327
diff
changeset
|
1059 $ cat f |
2b1ec74c961f
mdiff/patch: fix bad hunk handling for unified diffs with zero context
Nicolas Venegas <nvenegas@atlassian.com>
parents:
15327
diff
changeset
|
1060 c1 |
2b1ec74c961f
mdiff/patch: fix bad hunk handling for unified diffs with zero context
Nicolas Venegas <nvenegas@atlassian.com>
parents:
15327
diff
changeset
|
1061 c2 |
2b1ec74c961f
mdiff/patch: fix bad hunk handling for unified diffs with zero context
Nicolas Venegas <nvenegas@atlassian.com>
parents:
15327
diff
changeset
|
1062 c3 |
2b1ec74c961f
mdiff/patch: fix bad hunk handling for unified diffs with zero context
Nicolas Venegas <nvenegas@atlassian.com>
parents:
15327
diff
changeset
|
1063 c4 |
16123
b0c7525f826d
patch: fix fuzzing of hunks without previous lines (issue3264)
Patrick Mezard <patrick@mezard.eu>
parents:
16112
diff
changeset
|
1064 |
16912
6ef3107c661e
tests: cleanup of tests that got lost in their own nested directories
Mads Kiilerich <mads@kiilerich.com>
parents:
16889
diff
changeset
|
1065 $ cd .. |
6ef3107c661e
tests: cleanup of tests that got lost in their own nested directories
Mads Kiilerich <mads@kiilerich.com>
parents:
16889
diff
changeset
|
1066 |
16650
fcb97d9a26cd
patch: fix segfault against unified diffs which start line is zero
Yuya Nishihara <yuya@tcha.org>
parents:
16124
diff
changeset
|
1067 no segfault while importing a unified diff which start line is zero but chunk |
fcb97d9a26cd
patch: fix segfault against unified diffs which start line is zero
Yuya Nishihara <yuya@tcha.org>
parents:
16124
diff
changeset
|
1068 size is non-zero |
fcb97d9a26cd
patch: fix segfault against unified diffs which start line is zero
Yuya Nishihara <yuya@tcha.org>
parents:
16124
diff
changeset
|
1069 |
fcb97d9a26cd
patch: fix segfault against unified diffs which start line is zero
Yuya Nishihara <yuya@tcha.org>
parents:
16124
diff
changeset
|
1070 $ hg init startlinezero |
fcb97d9a26cd
patch: fix segfault against unified diffs which start line is zero
Yuya Nishihara <yuya@tcha.org>
parents:
16124
diff
changeset
|
1071 $ cd startlinezero |
fcb97d9a26cd
patch: fix segfault against unified diffs which start line is zero
Yuya Nishihara <yuya@tcha.org>
parents:
16124
diff
changeset
|
1072 $ echo foo > foo |
fcb97d9a26cd
patch: fix segfault against unified diffs which start line is zero
Yuya Nishihara <yuya@tcha.org>
parents:
16124
diff
changeset
|
1073 $ hg commit -Amfoo |
fcb97d9a26cd
patch: fix segfault against unified diffs which start line is zero
Yuya Nishihara <yuya@tcha.org>
parents:
16124
diff
changeset
|
1074 adding foo |
fcb97d9a26cd
patch: fix segfault against unified diffs which start line is zero
Yuya Nishihara <yuya@tcha.org>
parents:
16124
diff
changeset
|
1075 |
fcb97d9a26cd
patch: fix segfault against unified diffs which start line is zero
Yuya Nishihara <yuya@tcha.org>
parents:
16124
diff
changeset
|
1076 $ hg import --no-commit - << EOF |
fcb97d9a26cd
patch: fix segfault against unified diffs which start line is zero
Yuya Nishihara <yuya@tcha.org>
parents:
16124
diff
changeset
|
1077 > diff a/foo b/foo |
fcb97d9a26cd
patch: fix segfault against unified diffs which start line is zero
Yuya Nishihara <yuya@tcha.org>
parents:
16124
diff
changeset
|
1078 > --- a/foo |
fcb97d9a26cd
patch: fix segfault against unified diffs which start line is zero
Yuya Nishihara <yuya@tcha.org>
parents:
16124
diff
changeset
|
1079 > +++ b/foo |
fcb97d9a26cd
patch: fix segfault against unified diffs which start line is zero
Yuya Nishihara <yuya@tcha.org>
parents:
16124
diff
changeset
|
1080 > @@ -0,1 +0,1 @@ |
fcb97d9a26cd
patch: fix segfault against unified diffs which start line is zero
Yuya Nishihara <yuya@tcha.org>
parents:
16124
diff
changeset
|
1081 > foo |
fcb97d9a26cd
patch: fix segfault against unified diffs which start line is zero
Yuya Nishihara <yuya@tcha.org>
parents:
16124
diff
changeset
|
1082 > EOF |
fcb97d9a26cd
patch: fix segfault against unified diffs which start line is zero
Yuya Nishihara <yuya@tcha.org>
parents:
16124
diff
changeset
|
1083 applying patch from stdin |
fcb97d9a26cd
patch: fix segfault against unified diffs which start line is zero
Yuya Nishihara <yuya@tcha.org>
parents:
16124
diff
changeset
|
1084 |
fcb97d9a26cd
patch: fix segfault against unified diffs which start line is zero
Yuya Nishihara <yuya@tcha.org>
parents:
16124
diff
changeset
|
1085 $ cd .. |
fcb97d9a26cd
patch: fix segfault against unified diffs which start line is zero
Yuya Nishihara <yuya@tcha.org>
parents:
16124
diff
changeset
|
1086 |
16123
b0c7525f826d
patch: fix fuzzing of hunks without previous lines (issue3264)
Patrick Mezard <patrick@mezard.eu>
parents:
16112
diff
changeset
|
1087 Test corner case involving fuzz and skew |
b0c7525f826d
patch: fix fuzzing of hunks without previous lines (issue3264)
Patrick Mezard <patrick@mezard.eu>
parents:
16112
diff
changeset
|
1088 |
b0c7525f826d
patch: fix fuzzing of hunks without previous lines (issue3264)
Patrick Mezard <patrick@mezard.eu>
parents:
16112
diff
changeset
|
1089 $ hg init morecornercases |
b0c7525f826d
patch: fix fuzzing of hunks without previous lines (issue3264)
Patrick Mezard <patrick@mezard.eu>
parents:
16112
diff
changeset
|
1090 $ cd morecornercases |
b0c7525f826d
patch: fix fuzzing of hunks without previous lines (issue3264)
Patrick Mezard <patrick@mezard.eu>
parents:
16112
diff
changeset
|
1091 |
b0c7525f826d
patch: fix fuzzing of hunks without previous lines (issue3264)
Patrick Mezard <patrick@mezard.eu>
parents:
16112
diff
changeset
|
1092 $ cat > 01-no-context-beginning-of-file.diff <<EOF |
b0c7525f826d
patch: fix fuzzing of hunks without previous lines (issue3264)
Patrick Mezard <patrick@mezard.eu>
parents:
16112
diff
changeset
|
1093 > diff --git a/a b/a |
b0c7525f826d
patch: fix fuzzing of hunks without previous lines (issue3264)
Patrick Mezard <patrick@mezard.eu>
parents:
16112
diff
changeset
|
1094 > --- a/a |
b0c7525f826d
patch: fix fuzzing of hunks without previous lines (issue3264)
Patrick Mezard <patrick@mezard.eu>
parents:
16112
diff
changeset
|
1095 > +++ b/a |
b0c7525f826d
patch: fix fuzzing of hunks without previous lines (issue3264)
Patrick Mezard <patrick@mezard.eu>
parents:
16112
diff
changeset
|
1096 > @@ -1,0 +1,1 @@ |
b0c7525f826d
patch: fix fuzzing of hunks without previous lines (issue3264)
Patrick Mezard <patrick@mezard.eu>
parents:
16112
diff
changeset
|
1097 > +line |
b0c7525f826d
patch: fix fuzzing of hunks without previous lines (issue3264)
Patrick Mezard <patrick@mezard.eu>
parents:
16112
diff
changeset
|
1098 > EOF |
b0c7525f826d
patch: fix fuzzing of hunks without previous lines (issue3264)
Patrick Mezard <patrick@mezard.eu>
parents:
16112
diff
changeset
|
1099 |
b0c7525f826d
patch: fix fuzzing of hunks without previous lines (issue3264)
Patrick Mezard <patrick@mezard.eu>
parents:
16112
diff
changeset
|
1100 $ cat > 02-no-context-middle-of-file.diff <<EOF |
b0c7525f826d
patch: fix fuzzing of hunks without previous lines (issue3264)
Patrick Mezard <patrick@mezard.eu>
parents:
16112
diff
changeset
|
1101 > diff --git a/a b/a |
b0c7525f826d
patch: fix fuzzing of hunks without previous lines (issue3264)
Patrick Mezard <patrick@mezard.eu>
parents:
16112
diff
changeset
|
1102 > --- a/a |
b0c7525f826d
patch: fix fuzzing of hunks without previous lines (issue3264)
Patrick Mezard <patrick@mezard.eu>
parents:
16112
diff
changeset
|
1103 > +++ b/a |
b0c7525f826d
patch: fix fuzzing of hunks without previous lines (issue3264)
Patrick Mezard <patrick@mezard.eu>
parents:
16112
diff
changeset
|
1104 > @@ -1,1 +1,1 @@ |
b0c7525f826d
patch: fix fuzzing of hunks without previous lines (issue3264)
Patrick Mezard <patrick@mezard.eu>
parents:
16112
diff
changeset
|
1105 > -2 |
b0c7525f826d
patch: fix fuzzing of hunks without previous lines (issue3264)
Patrick Mezard <patrick@mezard.eu>
parents:
16112
diff
changeset
|
1106 > +add some skew |
b0c7525f826d
patch: fix fuzzing of hunks without previous lines (issue3264)
Patrick Mezard <patrick@mezard.eu>
parents:
16112
diff
changeset
|
1107 > @@ -2,0 +2,1 @@ |
b0c7525f826d
patch: fix fuzzing of hunks without previous lines (issue3264)
Patrick Mezard <patrick@mezard.eu>
parents:
16112
diff
changeset
|
1108 > +line |
b0c7525f826d
patch: fix fuzzing of hunks without previous lines (issue3264)
Patrick Mezard <patrick@mezard.eu>
parents:
16112
diff
changeset
|
1109 > EOF |
b0c7525f826d
patch: fix fuzzing of hunks without previous lines (issue3264)
Patrick Mezard <patrick@mezard.eu>
parents:
16112
diff
changeset
|
1110 |
b0c7525f826d
patch: fix fuzzing of hunks without previous lines (issue3264)
Patrick Mezard <patrick@mezard.eu>
parents:
16112
diff
changeset
|
1111 $ cat > 03-no-context-end-of-file.diff <<EOF |
b0c7525f826d
patch: fix fuzzing of hunks without previous lines (issue3264)
Patrick Mezard <patrick@mezard.eu>
parents:
16112
diff
changeset
|
1112 > diff --git a/a b/a |
b0c7525f826d
patch: fix fuzzing of hunks without previous lines (issue3264)
Patrick Mezard <patrick@mezard.eu>
parents:
16112
diff
changeset
|
1113 > --- a/a |
b0c7525f826d
patch: fix fuzzing of hunks without previous lines (issue3264)
Patrick Mezard <patrick@mezard.eu>
parents:
16112
diff
changeset
|
1114 > +++ b/a |
b0c7525f826d
patch: fix fuzzing of hunks without previous lines (issue3264)
Patrick Mezard <patrick@mezard.eu>
parents:
16112
diff
changeset
|
1115 > @@ -10,0 +10,1 @@ |
b0c7525f826d
patch: fix fuzzing of hunks without previous lines (issue3264)
Patrick Mezard <patrick@mezard.eu>
parents:
16112
diff
changeset
|
1116 > +line |
b0c7525f826d
patch: fix fuzzing of hunks without previous lines (issue3264)
Patrick Mezard <patrick@mezard.eu>
parents:
16112
diff
changeset
|
1117 > EOF |
b0c7525f826d
patch: fix fuzzing of hunks without previous lines (issue3264)
Patrick Mezard <patrick@mezard.eu>
parents:
16112
diff
changeset
|
1118 |
16124
0e0060bf2f44
patch: fuzz more aggressively to match patch(1) behaviour
Patrick Mezard <patrick@mezard.eu>
parents:
16123
diff
changeset
|
1119 $ cat > 04-middle-of-file-completely-fuzzed.diff <<EOF |
0e0060bf2f44
patch: fuzz more aggressively to match patch(1) behaviour
Patrick Mezard <patrick@mezard.eu>
parents:
16123
diff
changeset
|
1120 > diff --git a/a b/a |
0e0060bf2f44
patch: fuzz more aggressively to match patch(1) behaviour
Patrick Mezard <patrick@mezard.eu>
parents:
16123
diff
changeset
|
1121 > --- a/a |
0e0060bf2f44
patch: fuzz more aggressively to match patch(1) behaviour
Patrick Mezard <patrick@mezard.eu>
parents:
16123
diff
changeset
|
1122 > +++ b/a |
0e0060bf2f44
patch: fuzz more aggressively to match patch(1) behaviour
Patrick Mezard <patrick@mezard.eu>
parents:
16123
diff
changeset
|
1123 > @@ -1,1 +1,1 @@ |
0e0060bf2f44
patch: fuzz more aggressively to match patch(1) behaviour
Patrick Mezard <patrick@mezard.eu>
parents:
16123
diff
changeset
|
1124 > -2 |
0e0060bf2f44
patch: fuzz more aggressively to match patch(1) behaviour
Patrick Mezard <patrick@mezard.eu>
parents:
16123
diff
changeset
|
1125 > +add some skew |
0e0060bf2f44
patch: fuzz more aggressively to match patch(1) behaviour
Patrick Mezard <patrick@mezard.eu>
parents:
16123
diff
changeset
|
1126 > @@ -2,2 +2,3 @@ |
0e0060bf2f44
patch: fuzz more aggressively to match patch(1) behaviour
Patrick Mezard <patrick@mezard.eu>
parents:
16123
diff
changeset
|
1127 > not matching, should fuzz |
0e0060bf2f44
patch: fuzz more aggressively to match patch(1) behaviour
Patrick Mezard <patrick@mezard.eu>
parents:
16123
diff
changeset
|
1128 > ... a bit |
0e0060bf2f44
patch: fuzz more aggressively to match patch(1) behaviour
Patrick Mezard <patrick@mezard.eu>
parents:
16123
diff
changeset
|
1129 > +line |
0e0060bf2f44
patch: fuzz more aggressively to match patch(1) behaviour
Patrick Mezard <patrick@mezard.eu>
parents:
16123
diff
changeset
|
1130 > EOF |
0e0060bf2f44
patch: fuzz more aggressively to match patch(1) behaviour
Patrick Mezard <patrick@mezard.eu>
parents:
16123
diff
changeset
|
1131 |
16123
b0c7525f826d
patch: fix fuzzing of hunks without previous lines (issue3264)
Patrick Mezard <patrick@mezard.eu>
parents:
16112
diff
changeset
|
1132 $ cat > a <<EOF |
b0c7525f826d
patch: fix fuzzing of hunks without previous lines (issue3264)
Patrick Mezard <patrick@mezard.eu>
parents:
16112
diff
changeset
|
1133 > 1 |
b0c7525f826d
patch: fix fuzzing of hunks without previous lines (issue3264)
Patrick Mezard <patrick@mezard.eu>
parents:
16112
diff
changeset
|
1134 > 2 |
b0c7525f826d
patch: fix fuzzing of hunks without previous lines (issue3264)
Patrick Mezard <patrick@mezard.eu>
parents:
16112
diff
changeset
|
1135 > 3 |
b0c7525f826d
patch: fix fuzzing of hunks without previous lines (issue3264)
Patrick Mezard <patrick@mezard.eu>
parents:
16112
diff
changeset
|
1136 > 4 |
b0c7525f826d
patch: fix fuzzing of hunks without previous lines (issue3264)
Patrick Mezard <patrick@mezard.eu>
parents:
16112
diff
changeset
|
1137 > EOF |
b0c7525f826d
patch: fix fuzzing of hunks without previous lines (issue3264)
Patrick Mezard <patrick@mezard.eu>
parents:
16112
diff
changeset
|
1138 $ hg ci -Am adda a |
b0c7525f826d
patch: fix fuzzing of hunks without previous lines (issue3264)
Patrick Mezard <patrick@mezard.eu>
parents:
16112
diff
changeset
|
1139 $ for p in *.diff; do |
b0c7525f826d
patch: fix fuzzing of hunks without previous lines (issue3264)
Patrick Mezard <patrick@mezard.eu>
parents:
16112
diff
changeset
|
1140 > hg import -v --no-commit $p |
b0c7525f826d
patch: fix fuzzing of hunks without previous lines (issue3264)
Patrick Mezard <patrick@mezard.eu>
parents:
16112
diff
changeset
|
1141 > cat a |
b0c7525f826d
patch: fix fuzzing of hunks without previous lines (issue3264)
Patrick Mezard <patrick@mezard.eu>
parents:
16112
diff
changeset
|
1142 > hg revert -aqC a |
b0c7525f826d
patch: fix fuzzing of hunks without previous lines (issue3264)
Patrick Mezard <patrick@mezard.eu>
parents:
16112
diff
changeset
|
1143 > # patch -p1 < $p |
b0c7525f826d
patch: fix fuzzing of hunks without previous lines (issue3264)
Patrick Mezard <patrick@mezard.eu>
parents:
16112
diff
changeset
|
1144 > # cat a |
b0c7525f826d
patch: fix fuzzing of hunks without previous lines (issue3264)
Patrick Mezard <patrick@mezard.eu>
parents:
16112
diff
changeset
|
1145 > # hg revert -aC a |
b0c7525f826d
patch: fix fuzzing of hunks without previous lines (issue3264)
Patrick Mezard <patrick@mezard.eu>
parents:
16112
diff
changeset
|
1146 > done |
b0c7525f826d
patch: fix fuzzing of hunks without previous lines (issue3264)
Patrick Mezard <patrick@mezard.eu>
parents:
16112
diff
changeset
|
1147 applying 01-no-context-beginning-of-file.diff |
b0c7525f826d
patch: fix fuzzing of hunks without previous lines (issue3264)
Patrick Mezard <patrick@mezard.eu>
parents:
16112
diff
changeset
|
1148 patching file a |
b0c7525f826d
patch: fix fuzzing of hunks without previous lines (issue3264)
Patrick Mezard <patrick@mezard.eu>
parents:
16112
diff
changeset
|
1149 applied to working directory |
b0c7525f826d
patch: fix fuzzing of hunks without previous lines (issue3264)
Patrick Mezard <patrick@mezard.eu>
parents:
16112
diff
changeset
|
1150 1 |
b0c7525f826d
patch: fix fuzzing of hunks without previous lines (issue3264)
Patrick Mezard <patrick@mezard.eu>
parents:
16112
diff
changeset
|
1151 line |
b0c7525f826d
patch: fix fuzzing of hunks without previous lines (issue3264)
Patrick Mezard <patrick@mezard.eu>
parents:
16112
diff
changeset
|
1152 2 |
b0c7525f826d
patch: fix fuzzing of hunks without previous lines (issue3264)
Patrick Mezard <patrick@mezard.eu>
parents:
16112
diff
changeset
|
1153 3 |
b0c7525f826d
patch: fix fuzzing of hunks without previous lines (issue3264)
Patrick Mezard <patrick@mezard.eu>
parents:
16112
diff
changeset
|
1154 4 |
b0c7525f826d
patch: fix fuzzing of hunks without previous lines (issue3264)
Patrick Mezard <patrick@mezard.eu>
parents:
16112
diff
changeset
|
1155 applying 02-no-context-middle-of-file.diff |
b0c7525f826d
patch: fix fuzzing of hunks without previous lines (issue3264)
Patrick Mezard <patrick@mezard.eu>
parents:
16112
diff
changeset
|
1156 patching file a |
b0c7525f826d
patch: fix fuzzing of hunks without previous lines (issue3264)
Patrick Mezard <patrick@mezard.eu>
parents:
16112
diff
changeset
|
1157 Hunk #1 succeeded at 2 (offset 1 lines). |
b0c7525f826d
patch: fix fuzzing of hunks without previous lines (issue3264)
Patrick Mezard <patrick@mezard.eu>
parents:
16112
diff
changeset
|
1158 Hunk #2 succeeded at 4 (offset 1 lines). |
b0c7525f826d
patch: fix fuzzing of hunks without previous lines (issue3264)
Patrick Mezard <patrick@mezard.eu>
parents:
16112
diff
changeset
|
1159 applied to working directory |
b0c7525f826d
patch: fix fuzzing of hunks without previous lines (issue3264)
Patrick Mezard <patrick@mezard.eu>
parents:
16112
diff
changeset
|
1160 1 |
b0c7525f826d
patch: fix fuzzing of hunks without previous lines (issue3264)
Patrick Mezard <patrick@mezard.eu>
parents:
16112
diff
changeset
|
1161 add some skew |
b0c7525f826d
patch: fix fuzzing of hunks without previous lines (issue3264)
Patrick Mezard <patrick@mezard.eu>
parents:
16112
diff
changeset
|
1162 3 |
b0c7525f826d
patch: fix fuzzing of hunks without previous lines (issue3264)
Patrick Mezard <patrick@mezard.eu>
parents:
16112
diff
changeset
|
1163 line |
b0c7525f826d
patch: fix fuzzing of hunks without previous lines (issue3264)
Patrick Mezard <patrick@mezard.eu>
parents:
16112
diff
changeset
|
1164 4 |
b0c7525f826d
patch: fix fuzzing of hunks without previous lines (issue3264)
Patrick Mezard <patrick@mezard.eu>
parents:
16112
diff
changeset
|
1165 applying 03-no-context-end-of-file.diff |
b0c7525f826d
patch: fix fuzzing of hunks without previous lines (issue3264)
Patrick Mezard <patrick@mezard.eu>
parents:
16112
diff
changeset
|
1166 patching file a |
b0c7525f826d
patch: fix fuzzing of hunks without previous lines (issue3264)
Patrick Mezard <patrick@mezard.eu>
parents:
16112
diff
changeset
|
1167 Hunk #1 succeeded at 5 (offset -6 lines). |
b0c7525f826d
patch: fix fuzzing of hunks without previous lines (issue3264)
Patrick Mezard <patrick@mezard.eu>
parents:
16112
diff
changeset
|
1168 applied to working directory |
b0c7525f826d
patch: fix fuzzing of hunks without previous lines (issue3264)
Patrick Mezard <patrick@mezard.eu>
parents:
16112
diff
changeset
|
1169 1 |
b0c7525f826d
patch: fix fuzzing of hunks without previous lines (issue3264)
Patrick Mezard <patrick@mezard.eu>
parents:
16112
diff
changeset
|
1170 2 |
b0c7525f826d
patch: fix fuzzing of hunks without previous lines (issue3264)
Patrick Mezard <patrick@mezard.eu>
parents:
16112
diff
changeset
|
1171 3 |
b0c7525f826d
patch: fix fuzzing of hunks without previous lines (issue3264)
Patrick Mezard <patrick@mezard.eu>
parents:
16112
diff
changeset
|
1172 4 |
b0c7525f826d
patch: fix fuzzing of hunks without previous lines (issue3264)
Patrick Mezard <patrick@mezard.eu>
parents:
16112
diff
changeset
|
1173 line |
16124
0e0060bf2f44
patch: fuzz more aggressively to match patch(1) behaviour
Patrick Mezard <patrick@mezard.eu>
parents:
16123
diff
changeset
|
1174 applying 04-middle-of-file-completely-fuzzed.diff |
0e0060bf2f44
patch: fuzz more aggressively to match patch(1) behaviour
Patrick Mezard <patrick@mezard.eu>
parents:
16123
diff
changeset
|
1175 patching file a |
0e0060bf2f44
patch: fuzz more aggressively to match patch(1) behaviour
Patrick Mezard <patrick@mezard.eu>
parents:
16123
diff
changeset
|
1176 Hunk #1 succeeded at 2 (offset 1 lines). |
0e0060bf2f44
patch: fuzz more aggressively to match patch(1) behaviour
Patrick Mezard <patrick@mezard.eu>
parents:
16123
diff
changeset
|
1177 Hunk #2 succeeded at 5 with fuzz 2 (offset 1 lines). |
0e0060bf2f44
patch: fuzz more aggressively to match patch(1) behaviour
Patrick Mezard <patrick@mezard.eu>
parents:
16123
diff
changeset
|
1178 applied to working directory |
0e0060bf2f44
patch: fuzz more aggressively to match patch(1) behaviour
Patrick Mezard <patrick@mezard.eu>
parents:
16123
diff
changeset
|
1179 1 |
0e0060bf2f44
patch: fuzz more aggressively to match patch(1) behaviour
Patrick Mezard <patrick@mezard.eu>
parents:
16123
diff
changeset
|
1180 add some skew |
0e0060bf2f44
patch: fuzz more aggressively to match patch(1) behaviour
Patrick Mezard <patrick@mezard.eu>
parents:
16123
diff
changeset
|
1181 3 |
0e0060bf2f44
patch: fuzz more aggressively to match patch(1) behaviour
Patrick Mezard <patrick@mezard.eu>
parents:
16123
diff
changeset
|
1182 4 |
0e0060bf2f44
patch: fuzz more aggressively to match patch(1) behaviour
Patrick Mezard <patrick@mezard.eu>
parents:
16123
diff
changeset
|
1183 line |
21553
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1184 $ cd .. |
16123
b0c7525f826d
patch: fix fuzzing of hunks without previous lines (issue3264)
Patrick Mezard <patrick@mezard.eu>
parents:
16112
diff
changeset
|
1185 |
21553
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1186 Test partial application |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1187 ------------------------ |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1188 |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1189 prepare a stack of patches depending on each other |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1190 |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1191 $ hg init partial |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1192 $ cd partial |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1193 $ cat << EOF > a |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1194 > one |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1195 > two |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1196 > three |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1197 > four |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1198 > five |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1199 > six |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1200 > seven |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1201 > EOF |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1202 $ hg add a |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1203 $ echo 'b' > b |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1204 $ hg add b |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1205 $ hg commit -m 'initial' -u Babar |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1206 $ cat << EOF > a |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1207 > one |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1208 > two |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1209 > 3 |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1210 > four |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1211 > five |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1212 > six |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1213 > seven |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1214 > EOF |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1215 $ hg commit -m 'three' -u Celeste |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1216 $ cat << EOF > a |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1217 > one |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1218 > two |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1219 > 3 |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1220 > 4 |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1221 > five |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1222 > six |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1223 > seven |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1224 > EOF |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1225 $ hg commit -m 'four' -u Rataxes |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1226 $ cat << EOF > a |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1227 > one |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1228 > two |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1229 > 3 |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1230 > 4 |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1231 > 5 |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1232 > six |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1233 > seven |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1234 > EOF |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1235 $ echo bb >> b |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1236 $ hg commit -m 'five' -u Arthur |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1237 $ echo 'Babar' > jungle |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1238 $ hg add jungle |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1239 $ hg ci -m 'jungle' -u Zephir |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1240 $ echo 'Celeste' >> jungle |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1241 $ hg ci -m 'extended jungle' -u Cornelius |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1242 $ hg log -G --template '{desc|firstline} [{author}] {diffstat}\n' |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1243 @ extended jungle [Cornelius] 1: +1/-0 |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1244 | |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1245 o jungle [Zephir] 1: +1/-0 |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1246 | |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1247 o five [Arthur] 2: +2/-1 |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1248 | |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1249 o four [Rataxes] 1: +1/-1 |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1250 | |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1251 o three [Celeste] 1: +1/-1 |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1252 | |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1253 o initial [Babar] 2: +8/-0 |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1254 |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1255 |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1256 Importing with some success and some errors: |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1257 |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1258 $ hg update --rev 'desc(initial)' |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1259 2 files updated, 0 files merged, 1 files removed, 0 files unresolved |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1260 $ hg export --rev 'desc(five)' | hg import --partial - |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1261 applying patch from stdin |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1262 patching file a |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1263 Hunk #1 FAILED at 1 |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1264 1 out of 1 hunks FAILED -- saving rejects to file a.rej |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1265 patch applied partially |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1266 (fix the .rej files and run `hg commit --amend`) |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1267 [1] |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1268 |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1269 $ hg log -G --template '{desc|firstline} [{author}] {diffstat}\n' |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1270 @ five [Arthur] 1: +1/-0 |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1271 | |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1272 | o extended jungle [Cornelius] 1: +1/-0 |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1273 | | |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1274 | o jungle [Zephir] 1: +1/-0 |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1275 | | |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1276 | o five [Arthur] 2: +2/-1 |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1277 | | |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1278 | o four [Rataxes] 1: +1/-1 |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1279 | | |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1280 | o three [Celeste] 1: +1/-1 |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1281 |/ |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1282 o initial [Babar] 2: +8/-0 |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1283 |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1284 $ hg export |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1285 # HG changeset patch |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1286 # User Arthur |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1287 # Date 0 0 |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1288 # Thu Jan 01 00:00:00 1970 +0000 |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1289 # Node ID 26e6446bb2526e2be1037935f5fca2b2706f1509 |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1290 # Parent 8e4f0351909eae6b9cf68c2c076cb54c42b54b2e |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1291 five |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1292 |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1293 diff -r 8e4f0351909e -r 26e6446bb252 b |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1294 --- a/b Thu Jan 01 00:00:00 1970 +0000 |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1295 +++ b/b Thu Jan 01 00:00:00 1970 +0000 |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1296 @@ -1,1 +1,2 @@ |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1297 b |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1298 +bb |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1299 $ hg status -c . |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1300 C a |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1301 C b |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1302 $ ls |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1303 a |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1304 a.rej |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1305 b |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1306 |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1307 Importing with zero success: |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1308 |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1309 $ hg update --rev 'desc(initial)' |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1310 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1311 $ hg export --rev 'desc(four)' | hg import --partial - |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1312 applying patch from stdin |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1313 patching file a |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1314 Hunk #1 FAILED at 0 |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1315 1 out of 1 hunks FAILED -- saving rejects to file a.rej |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1316 patch applied partially |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1317 (fix the .rej files and run `hg commit --amend`) |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1318 [1] |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1319 |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1320 $ hg log -G --template '{desc|firstline} [{author}] {diffstat}\n' |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1321 @ four [Rataxes] 0: +0/-0 |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1322 | |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1323 | o five [Arthur] 1: +1/-0 |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1324 |/ |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1325 | o extended jungle [Cornelius] 1: +1/-0 |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1326 | | |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1327 | o jungle [Zephir] 1: +1/-0 |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1328 | | |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1329 | o five [Arthur] 2: +2/-1 |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1330 | | |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1331 | o four [Rataxes] 1: +1/-1 |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1332 | | |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1333 | o three [Celeste] 1: +1/-1 |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1334 |/ |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1335 o initial [Babar] 2: +8/-0 |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1336 |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1337 $ hg export |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1338 # HG changeset patch |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1339 # User Rataxes |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1340 # Date 0 0 |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1341 # Thu Jan 01 00:00:00 1970 +0000 |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1342 # Node ID cb9b1847a74d9ad52e93becaf14b98dbcc274e1e |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1343 # Parent 8e4f0351909eae6b9cf68c2c076cb54c42b54b2e |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1344 four |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1345 |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1346 $ hg status -c . |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1347 C a |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1348 C b |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1349 $ ls |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1350 a |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1351 a.rej |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1352 b |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1353 |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1354 Importing with unknown file: |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1355 |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1356 $ hg update --rev 'desc(initial)' |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1357 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1358 $ hg export --rev 'desc("extended jungle")' | hg import --partial - |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1359 applying patch from stdin |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1360 unable to find 'jungle' for patching |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1361 1 out of 1 hunks FAILED -- saving rejects to file jungle.rej |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1362 patch applied partially |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1363 (fix the .rej files and run `hg commit --amend`) |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1364 [1] |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1365 |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1366 $ hg log -G --template '{desc|firstline} [{author}] {diffstat}\n' |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1367 @ extended jungle [Cornelius] 0: +0/-0 |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1368 | |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1369 | o four [Rataxes] 0: +0/-0 |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1370 |/ |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1371 | o five [Arthur] 1: +1/-0 |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1372 |/ |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1373 | o extended jungle [Cornelius] 1: +1/-0 |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1374 | | |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1375 | o jungle [Zephir] 1: +1/-0 |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1376 | | |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1377 | o five [Arthur] 2: +2/-1 |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1378 | | |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1379 | o four [Rataxes] 1: +1/-1 |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1380 | | |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1381 | o three [Celeste] 1: +1/-1 |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1382 |/ |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1383 o initial [Babar] 2: +8/-0 |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1384 |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1385 $ hg export |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1386 # HG changeset patch |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1387 # User Cornelius |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1388 # Date 0 0 |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1389 # Thu Jan 01 00:00:00 1970 +0000 |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1390 # Node ID 1fb1f86bef43c5a75918178f8d23c29fb0a7398d |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1391 # Parent 8e4f0351909eae6b9cf68c2c076cb54c42b54b2e |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1392 extended jungle |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1393 |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1394 $ hg status -c . |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1395 C a |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1396 C b |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1397 $ ls |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1398 a |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1399 a.rej |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1400 b |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1401 jungle.rej |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1402 |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1403 Importing multiple failing patches: |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1404 |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1405 $ hg update --rev 'desc(initial)' |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1406 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1407 $ echo 'B' > b # just to make another commit |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1408 $ hg commit -m "a new base" |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1409 created new head |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1410 $ hg export --rev 'desc("extended jungle") + desc("four")' | hg import --partial - |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1411 applying patch from stdin |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1412 patching file a |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1413 Hunk #1 FAILED at 0 |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1414 1 out of 1 hunks FAILED -- saving rejects to file a.rej |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1415 patch applied partially |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1416 (fix the .rej files and run `hg commit --amend`) |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1417 [1] |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1418 $ hg log -G --template '{desc|firstline} [{author}] {diffstat}\n' |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1419 @ four [Rataxes] 0: +0/-0 |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1420 | |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1421 o a new base [test] 1: +1/-1 |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1422 | |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1423 | o extended jungle [Cornelius] 0: +0/-0 |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1424 |/ |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1425 | o four [Rataxes] 0: +0/-0 |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1426 |/ |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1427 | o five [Arthur] 1: +1/-0 |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1428 |/ |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1429 | o extended jungle [Cornelius] 1: +1/-0 |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1430 | | |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1431 | o jungle [Zephir] 1: +1/-0 |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1432 | | |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1433 | o five [Arthur] 2: +2/-1 |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1434 | | |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1435 | o four [Rataxes] 1: +1/-1 |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1436 | | |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1437 | o three [Celeste] 1: +1/-1 |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1438 |/ |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1439 o initial [Babar] 2: +8/-0 |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1440 |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1441 $ hg export |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1442 # HG changeset patch |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1443 # User Rataxes |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1444 # Date 0 0 |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1445 # Thu Jan 01 00:00:00 1970 +0000 |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1446 # Node ID a9d7b6d0ffbb4eb12b7d5939250fcd42e8930a1d |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1447 # Parent f59f8d2e95a8ca5b1b4ca64320140da85f3b44fd |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1448 four |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1449 |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1450 $ hg status -c . |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1451 C a |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1452 C b |