Mercurial > hg
annotate tests/test-import-merge.t @ 50329:3dbc7b1ecaba stable
typing: correct the signature of error.CommandError
There's a place in `mercurial.dispatch._parse()` that passes None if a parse
error happens before the command can be parsed out, and casting the error to
bytes works fine because the command and message fields are apparently ignored.
Likewise, TortoiseHg similarly passes None for the same reason.
author | Matt Harbison <matt_harbison@yahoo.com> |
---|---|
date | Fri, 24 Mar 2023 02:22:12 -0400 |
parents | 2f2682f40ea0 |
children |
rev | line source |
---|---|
15511
6cae68a361ed
import: fix parent selection when importing merges
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
1 $ echo "[extensions]" >> $HGRCPATH |
6cae68a361ed
import: fix parent selection when importing merges
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
2 $ echo "mq=" >> $HGRCPATH |
6cae68a361ed
import: fix parent selection when importing merges
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
3 |
6cae68a361ed
import: fix parent selection when importing merges
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
4 $ tipparents() { |
6cae68a361ed
import: fix parent selection when importing merges
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
5 > hg parents --template "{rev}:{node|short} {desc|firstline}\n" -r tip |
6cae68a361ed
import: fix parent selection when importing merges
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
6 > } |
6cae68a361ed
import: fix parent selection when importing merges
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
7 |
6cae68a361ed
import: fix parent selection when importing merges
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
8 Test import and merge diffs |
6cae68a361ed
import: fix parent selection when importing merges
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
9 |
6cae68a361ed
import: fix parent selection when importing merges
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
10 $ hg init repo |
6cae68a361ed
import: fix parent selection when importing merges
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
11 $ cd repo |
6cae68a361ed
import: fix parent selection when importing merges
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
12 $ echo a > a |
6cae68a361ed
import: fix parent selection when importing merges
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
13 $ hg ci -Am adda |
6cae68a361ed
import: fix parent selection when importing merges
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
14 adding a |
6cae68a361ed
import: fix parent selection when importing merges
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
15 $ echo a >> a |
6cae68a361ed
import: fix parent selection when importing merges
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
16 $ hg ci -m changea |
6cae68a361ed
import: fix parent selection when importing merges
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
17 $ echo c > c |
6cae68a361ed
import: fix parent selection when importing merges
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
18 $ hg ci -Am addc |
6cae68a361ed
import: fix parent selection when importing merges
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
19 adding c |
6cae68a361ed
import: fix parent selection when importing merges
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
20 $ hg up 0 |
6cae68a361ed
import: fix parent selection when importing merges
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
21 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
6cae68a361ed
import: fix parent selection when importing merges
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
22 $ echo b > b |
6cae68a361ed
import: fix parent selection when importing merges
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
23 $ hg ci -Am addb |
6cae68a361ed
import: fix parent selection when importing merges
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
24 adding b |
6cae68a361ed
import: fix parent selection when importing merges
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
25 created new head |
6cae68a361ed
import: fix parent selection when importing merges
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
26 $ hg up 1 |
6cae68a361ed
import: fix parent selection when importing merges
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
27 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
6cae68a361ed
import: fix parent selection when importing merges
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
28 $ hg merge 3 |
6cae68a361ed
import: fix parent selection when importing merges
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
29 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
6cae68a361ed
import: fix parent selection when importing merges
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
30 (branch merge, don't forget to commit) |
6cae68a361ed
import: fix parent selection when importing merges
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
31 $ hg ci -m merge |
6cae68a361ed
import: fix parent selection when importing merges
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
32 $ hg export . > ../merge.diff |
22250
f3200bf460a8
import: change "editform" to distinguish merge commits from others
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
20303
diff
changeset
|
33 $ grep -v '^merge$' ../merge.diff > ../merge.nomsg.diff |
15511
6cae68a361ed
import: fix parent selection when importing merges
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
34 $ cd .. |
6cae68a361ed
import: fix parent selection when importing merges
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
35 $ hg clone -r2 repo repo2 |
6cae68a361ed
import: fix parent selection when importing merges
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
36 adding changesets |
6cae68a361ed
import: fix parent selection when importing merges
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
37 adding manifests |
6cae68a361ed
import: fix parent selection when importing merges
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
38 adding file changes |
6cae68a361ed
import: fix parent selection when importing merges
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
39 added 3 changesets with 3 changes to 2 files |
34661
eb586ed5d8ce
transaction-summary: show the range of new revisions upon pull/unbundle (BC)
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
22305
diff
changeset
|
40 new changesets 07f494440405:890ecaa90481 |
15511
6cae68a361ed
import: fix parent selection when importing merges
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
41 updating to branch default |
6cae68a361ed
import: fix parent selection when importing merges
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
42 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
6cae68a361ed
import: fix parent selection when importing merges
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
43 $ cd repo2 |
6cae68a361ed
import: fix parent selection when importing merges
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
44 $ hg pull -r3 ../repo |
6cae68a361ed
import: fix parent selection when importing merges
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
45 pulling from ../repo |
6cae68a361ed
import: fix parent selection when importing merges
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
46 searching for changes |
6cae68a361ed
import: fix parent selection when importing merges
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
47 adding changesets |
6cae68a361ed
import: fix parent selection when importing merges
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
48 adding manifests |
6cae68a361ed
import: fix parent selection when importing merges
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
49 adding file changes |
6cae68a361ed
import: fix parent selection when importing merges
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
50 added 1 changesets with 1 changes to 1 files (+1 heads) |
34661
eb586ed5d8ce
transaction-summary: show the range of new revisions upon pull/unbundle (BC)
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
22305
diff
changeset
|
51 new changesets 102a90ea7b4a |
15511
6cae68a361ed
import: fix parent selection when importing merges
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
52 (run 'hg heads' to see heads, 'hg merge' to merge) |
6cae68a361ed
import: fix parent selection when importing merges
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
53 |
6cae68a361ed
import: fix parent selection when importing merges
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
54 Test without --exact and diff.p1 == workingdir.p1 |
6cae68a361ed
import: fix parent selection when importing merges
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
55 |
6cae68a361ed
import: fix parent selection when importing merges
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
56 $ hg up 1 |
6cae68a361ed
import: fix parent selection when importing merges
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
57 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
22250
f3200bf460a8
import: change "editform" to distinguish merge commits from others
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
20303
diff
changeset
|
58 $ cat > $TESTTMP/editor.sh <<EOF |
f3200bf460a8
import: change "editform" to distinguish merge commits from others
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
20303
diff
changeset
|
59 > env | grep HGEDITFORM |
f3200bf460a8
import: change "editform" to distinguish merge commits from others
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
20303
diff
changeset
|
60 > echo merge > \$1 |
f3200bf460a8
import: change "editform" to distinguish merge commits from others
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
20303
diff
changeset
|
61 > EOF |
f3200bf460a8
import: change "editform" to distinguish merge commits from others
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
20303
diff
changeset
|
62 $ HGEDITOR="sh $TESTTMP/editor.sh" hg import --edit ../merge.nomsg.diff |
f3200bf460a8
import: change "editform" to distinguish merge commits from others
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
20303
diff
changeset
|
63 applying ../merge.nomsg.diff |
f3200bf460a8
import: change "editform" to distinguish merge commits from others
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
20303
diff
changeset
|
64 HGEDITFORM=import.normal.merge |
15511
6cae68a361ed
import: fix parent selection when importing merges
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
65 $ tipparents |
6cae68a361ed
import: fix parent selection when importing merges
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
66 1:540395c44225 changea |
6cae68a361ed
import: fix parent selection when importing merges
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
67 3:102a90ea7b4a addb |
6cae68a361ed
import: fix parent selection when importing merges
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
68 $ hg strip --no-backup tip |
6cae68a361ed
import: fix parent selection when importing merges
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
69 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
6cae68a361ed
import: fix parent selection when importing merges
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
70 |
6cae68a361ed
import: fix parent selection when importing merges
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
71 Test without --exact and diff.p1 != workingdir.p1 |
6cae68a361ed
import: fix parent selection when importing merges
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
72 |
6cae68a361ed
import: fix parent selection when importing merges
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
73 $ hg up 2 |
6cae68a361ed
import: fix parent selection when importing merges
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
74 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
6cae68a361ed
import: fix parent selection when importing merges
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
75 $ hg import ../merge.diff |
6cae68a361ed
import: fix parent selection when importing merges
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
76 applying ../merge.diff |
22303
0c838e7459a5
import: show the warning message for failure of merging
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
20303
diff
changeset
|
77 warning: import the patch as a normal revision |
0c838e7459a5
import: show the warning message for failure of merging
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
20303
diff
changeset
|
78 (use --exact to import the patch as a merge) |
15511
6cae68a361ed
import: fix parent selection when importing merges
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
79 $ tipparents |
6cae68a361ed
import: fix parent selection when importing merges
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
80 2:890ecaa90481 addc |
6cae68a361ed
import: fix parent selection when importing merges
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
81 $ hg strip --no-backup tip |
6cae68a361ed
import: fix parent selection when importing merges
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
82 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
6cae68a361ed
import: fix parent selection when importing merges
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
83 |
6cae68a361ed
import: fix parent selection when importing merges
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
84 Test with --exact |
6cae68a361ed
import: fix parent selection when importing merges
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
85 |
6cae68a361ed
import: fix parent selection when importing merges
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
86 $ hg import --exact ../merge.diff |
6cae68a361ed
import: fix parent selection when importing merges
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
87 applying ../merge.diff |
6cae68a361ed
import: fix parent selection when importing merges
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
88 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
6cae68a361ed
import: fix parent selection when importing merges
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
89 $ tipparents |
6cae68a361ed
import: fix parent selection when importing merges
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
90 1:540395c44225 changea |
6cae68a361ed
import: fix parent selection when importing merges
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
91 3:102a90ea7b4a addb |
6cae68a361ed
import: fix parent selection when importing merges
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
92 $ hg strip --no-backup tip |
6cae68a361ed
import: fix parent selection when importing merges
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
93 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
6cae68a361ed
import: fix parent selection when importing merges
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
94 |
6cae68a361ed
import: fix parent selection when importing merges
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
95 Test with --bypass and diff.p1 == workingdir.p1 |
6cae68a361ed
import: fix parent selection when importing merges
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
96 |
6cae68a361ed
import: fix parent selection when importing merges
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
97 $ hg up 1 |
6cae68a361ed
import: fix parent selection when importing merges
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
98 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
6cae68a361ed
import: fix parent selection when importing merges
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
99 $ hg import --bypass ../merge.diff |
6cae68a361ed
import: fix parent selection when importing merges
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
100 applying ../merge.diff |
6cae68a361ed
import: fix parent selection when importing merges
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
101 $ tipparents |
6cae68a361ed
import: fix parent selection when importing merges
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
102 1:540395c44225 changea |
6cae68a361ed
import: fix parent selection when importing merges
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
103 3:102a90ea7b4a addb |
6cae68a361ed
import: fix parent selection when importing merges
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
104 $ hg strip --no-backup tip |
6cae68a361ed
import: fix parent selection when importing merges
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
105 |
6cae68a361ed
import: fix parent selection when importing merges
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
106 Test with --bypass and diff.p1 != workingdir.p1 |
6cae68a361ed
import: fix parent selection when importing merges
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
107 |
6cae68a361ed
import: fix parent selection when importing merges
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
108 $ hg up 2 |
6cae68a361ed
import: fix parent selection when importing merges
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
109 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
6cae68a361ed
import: fix parent selection when importing merges
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
110 $ hg import --bypass ../merge.diff |
6cae68a361ed
import: fix parent selection when importing merges
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
111 applying ../merge.diff |
22303
0c838e7459a5
import: show the warning message for failure of merging
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
20303
diff
changeset
|
112 warning: import the patch as a normal revision |
0c838e7459a5
import: show the warning message for failure of merging
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
20303
diff
changeset
|
113 (use --exact to import the patch as a merge) |
15511
6cae68a361ed
import: fix parent selection when importing merges
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
114 $ tipparents |
6cae68a361ed
import: fix parent selection when importing merges
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
115 2:890ecaa90481 addc |
6cae68a361ed
import: fix parent selection when importing merges
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
116 $ hg strip --no-backup tip |
6cae68a361ed
import: fix parent selection when importing merges
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
117 |
6cae68a361ed
import: fix parent selection when importing merges
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
118 Test with --bypass and --exact |
6cae68a361ed
import: fix parent selection when importing merges
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
119 |
6cae68a361ed
import: fix parent selection when importing merges
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
120 $ hg import --bypass --exact ../merge.diff |
6cae68a361ed
import: fix parent selection when importing merges
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
121 applying ../merge.diff |
6cae68a361ed
import: fix parent selection when importing merges
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
122 $ tipparents |
6cae68a361ed
import: fix parent selection when importing merges
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
123 1:540395c44225 changea |
6cae68a361ed
import: fix parent selection when importing merges
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
124 3:102a90ea7b4a addb |
6cae68a361ed
import: fix parent selection when importing merges
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
125 $ hg strip --no-backup tip |
6cae68a361ed
import: fix parent selection when importing merges
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
126 |
16913
f2719b387380
tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents:
15511
diff
changeset
|
127 $ cd .. |
18656
8eb3408bf005
import: don't rollback on failed import --exact (issue3616)
Kevin Bullock <kbullock@ringworld.org>
parents:
16913
diff
changeset
|
128 |
8eb3408bf005
import: don't rollback on failed import --exact (issue3616)
Kevin Bullock <kbullock@ringworld.org>
parents:
16913
diff
changeset
|
129 Test that --exact on a bad header doesn't corrupt the repo (issue3616) |
8eb3408bf005
import: don't rollback on failed import --exact (issue3616)
Kevin Bullock <kbullock@ringworld.org>
parents:
16913
diff
changeset
|
130 |
8eb3408bf005
import: don't rollback on failed import --exact (issue3616)
Kevin Bullock <kbullock@ringworld.org>
parents:
16913
diff
changeset
|
131 $ hg init repo3 |
8eb3408bf005
import: don't rollback on failed import --exact (issue3616)
Kevin Bullock <kbullock@ringworld.org>
parents:
16913
diff
changeset
|
132 $ cd repo3 |
8eb3408bf005
import: don't rollback on failed import --exact (issue3616)
Kevin Bullock <kbullock@ringworld.org>
parents:
16913
diff
changeset
|
133 $ echo a>a |
8eb3408bf005
import: don't rollback on failed import --exact (issue3616)
Kevin Bullock <kbullock@ringworld.org>
parents:
16913
diff
changeset
|
134 $ hg ci -Aqm0 |
8eb3408bf005
import: don't rollback on failed import --exact (issue3616)
Kevin Bullock <kbullock@ringworld.org>
parents:
16913
diff
changeset
|
135 $ echo a>>a |
8eb3408bf005
import: don't rollback on failed import --exact (issue3616)
Kevin Bullock <kbullock@ringworld.org>
parents:
16913
diff
changeset
|
136 $ hg ci -m1 |
8eb3408bf005
import: don't rollback on failed import --exact (issue3616)
Kevin Bullock <kbullock@ringworld.org>
parents:
16913
diff
changeset
|
137 $ echo a>>a |
8eb3408bf005
import: don't rollback on failed import --exact (issue3616)
Kevin Bullock <kbullock@ringworld.org>
parents:
16913
diff
changeset
|
138 $ hg ci -m2 |
8eb3408bf005
import: don't rollback on failed import --exact (issue3616)
Kevin Bullock <kbullock@ringworld.org>
parents:
16913
diff
changeset
|
139 $ echo a>a |
8eb3408bf005
import: don't rollback on failed import --exact (issue3616)
Kevin Bullock <kbullock@ringworld.org>
parents:
16913
diff
changeset
|
140 $ echo b>>a |
8eb3408bf005
import: don't rollback on failed import --exact (issue3616)
Kevin Bullock <kbullock@ringworld.org>
parents:
16913
diff
changeset
|
141 $ echo a>>a |
8eb3408bf005
import: don't rollback on failed import --exact (issue3616)
Kevin Bullock <kbullock@ringworld.org>
parents:
16913
diff
changeset
|
142 $ hg ci -m3 |
8eb3408bf005
import: don't rollback on failed import --exact (issue3616)
Kevin Bullock <kbullock@ringworld.org>
parents:
16913
diff
changeset
|
143 $ hg export 2 | head -7 > ../a.patch |
19628
3193b23eec61
solaris: tests can't use tail -n
Danek Duvall <danek.duvall@oracle.com>
parents:
18656
diff
changeset
|
144 $ hg export tip > out |
20303
3a3731a60354
test-import-merge: mangle file in binary mode
Matt Mackall <mpm@selenic.com>
parents:
19628
diff
changeset
|
145 >>> apatch = open("../a.patch", "ab") |
38086
b95a6fb7ae66
py3: fix .write() calls in few tests
Pulkit Goyal <7895pulkit@gmail.com>
parents:
34661
diff
changeset
|
146 >>> apatch.write(b"".join(open("out", 'rb').readlines()[7:])) and None |
18656
8eb3408bf005
import: don't rollback on failed import --exact (issue3616)
Kevin Bullock <kbullock@ringworld.org>
parents:
16913
diff
changeset
|
147 |
8eb3408bf005
import: don't rollback on failed import --exact (issue3616)
Kevin Bullock <kbullock@ringworld.org>
parents:
16913
diff
changeset
|
148 $ cd .. |
8eb3408bf005
import: don't rollback on failed import --exact (issue3616)
Kevin Bullock <kbullock@ringworld.org>
parents:
16913
diff
changeset
|
149 $ hg clone -qr0 repo3 repo3-clone |
8eb3408bf005
import: don't rollback on failed import --exact (issue3616)
Kevin Bullock <kbullock@ringworld.org>
parents:
16913
diff
changeset
|
150 $ cd repo3-clone |
8eb3408bf005
import: don't rollback on failed import --exact (issue3616)
Kevin Bullock <kbullock@ringworld.org>
parents:
16913
diff
changeset
|
151 $ hg pull -qr1 ../repo3 |
8eb3408bf005
import: don't rollback on failed import --exact (issue3616)
Kevin Bullock <kbullock@ringworld.org>
parents:
16913
diff
changeset
|
152 |
8eb3408bf005
import: don't rollback on failed import --exact (issue3616)
Kevin Bullock <kbullock@ringworld.org>
parents:
16913
diff
changeset
|
153 $ hg import --exact ../a.patch |
8eb3408bf005
import: don't rollback on failed import --exact (issue3616)
Kevin Bullock <kbullock@ringworld.org>
parents:
16913
diff
changeset
|
154 applying ../a.patch |
8eb3408bf005
import: don't rollback on failed import --exact (issue3616)
Kevin Bullock <kbullock@ringworld.org>
parents:
16913
diff
changeset
|
155 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
8eb3408bf005
import: don't rollback on failed import --exact (issue3616)
Kevin Bullock <kbullock@ringworld.org>
parents:
16913
diff
changeset
|
156 patching file a |
8eb3408bf005
import: don't rollback on failed import --exact (issue3616)
Kevin Bullock <kbullock@ringworld.org>
parents:
16913
diff
changeset
|
157 Hunk #1 succeeded at 1 with fuzz 1 (offset -1 lines). |
8eb3408bf005
import: don't rollback on failed import --exact (issue3616)
Kevin Bullock <kbullock@ringworld.org>
parents:
16913
diff
changeset
|
158 transaction abort! |
8eb3408bf005
import: don't rollback on failed import --exact (issue3616)
Kevin Bullock <kbullock@ringworld.org>
parents:
16913
diff
changeset
|
159 rollback completed |
8eb3408bf005
import: don't rollback on failed import --exact (issue3616)
Kevin Bullock <kbullock@ringworld.org>
parents:
16913
diff
changeset
|
160 abort: patch is damaged or loses information |
8eb3408bf005
import: don't rollback on failed import --exact (issue3616)
Kevin Bullock <kbullock@ringworld.org>
parents:
16913
diff
changeset
|
161 [255] |
49825
2f2682f40ea0
tests: use the `--quiet` flag for verify when applicable
Raphaël Gomès <rgomes@octobus.net>
parents:
39489
diff
changeset
|
162 $ hg verify -q |