Show More
@@ -963,10 +963,10 b' class queue:' | |||||
963 | raise |
|
963 | raise | |
964 | top = self.applied[-1].name |
|
964 | top = self.applied[-1].name | |
965 | if ret[0]: |
|
965 | if ret[0]: | |
966 |
self.ui.write(_(" |
|
966 | self.ui.write(_("errors during apply, please fix and " | |
967 | "refresh %s\n") % top) |
|
967 | "refresh %s\n") % top) | |
968 | else: |
|
968 | else: | |
969 |
self.ui.write(_(" |
|
969 | self.ui.write(_("now at: %s\n") % top) | |
970 | return ret[0] |
|
970 | return ret[0] | |
971 | finally: |
|
971 | finally: | |
972 | del wlock |
|
972 | del wlock | |
@@ -1067,16 +1067,16 b' class queue:' | |||||
1067 | del self.applied[start:end] |
|
1067 | del self.applied[start:end] | |
1068 | self.strip(repo, rev, update=False, backup='strip') |
|
1068 | self.strip(repo, rev, update=False, backup='strip') | |
1069 | if len(self.applied): |
|
1069 | if len(self.applied): | |
1070 |
self.ui.write(_(" |
|
1070 | self.ui.write(_("now at: %s\n") % self.applied[-1].name) | |
1071 | else: |
|
1071 | else: | |
1072 |
self.ui.write(_(" |
|
1072 | self.ui.write(_("patch queue now empty\n")) | |
1073 | finally: |
|
1073 | finally: | |
1074 | del wlock |
|
1074 | del wlock | |
1075 |
|
1075 | |||
1076 | def diff(self, repo, pats, opts): |
|
1076 | def diff(self, repo, pats, opts): | |
1077 | top = self.check_toppatch(repo) |
|
1077 | top = self.check_toppatch(repo) | |
1078 | if not top: |
|
1078 | if not top: | |
1079 |
self.ui.write(_(" |
|
1079 | self.ui.write(_("no patches applied\n")) | |
1080 | return |
|
1080 | return | |
1081 | qp = self.qparents(repo, top) |
|
1081 | qp = self.qparents(repo, top) | |
1082 | self._diffopts = patch.diffopts(self.ui, opts) |
|
1082 | self._diffopts = patch.diffopts(self.ui, opts) | |
@@ -1084,7 +1084,7 b' class queue:' | |||||
1084 |
|
1084 | |||
1085 | def refresh(self, repo, pats=None, **opts): |
|
1085 | def refresh(self, repo, pats=None, **opts): | |
1086 | if len(self.applied) == 0: |
|
1086 | if len(self.applied) == 0: | |
1087 |
self.ui.write(_(" |
|
1087 | self.ui.write(_("no patches applied\n")) | |
1088 | return 1 |
|
1088 | return 1 | |
1089 | msg = opts.get('msg', '').rstrip() |
|
1089 | msg = opts.get('msg', '').rstrip() | |
1090 | newuser = opts.get('user') |
|
1090 | newuser = opts.get('user') | |
@@ -1797,7 +1797,7 b' def top(ui, repo, **opts):' | |||||
1797 | return q.qseries(repo, start=t-1, length=1, status='A', |
|
1797 | return q.qseries(repo, start=t-1, length=1, status='A', | |
1798 | summary=opts.get('summary')) |
|
1798 | summary=opts.get('summary')) | |
1799 | else: |
|
1799 | else: | |
1800 |
ui.write(_(" |
|
1800 | ui.write(_("no patches applied\n")) | |
1801 | return 1 |
|
1801 | return 1 | |
1802 |
|
1802 | |||
1803 | def next(ui, repo, **opts): |
|
1803 | def next(ui, repo, **opts): | |
@@ -1805,7 +1805,7 b' def next(ui, repo, **opts):' | |||||
1805 | q = repo.mq |
|
1805 | q = repo.mq | |
1806 | end = q.series_end() |
|
1806 | end = q.series_end() | |
1807 | if end == len(q.series): |
|
1807 | if end == len(q.series): | |
1808 |
ui.write(_(" |
|
1808 | ui.write(_("all patches applied\n")) | |
1809 | return 1 |
|
1809 | return 1 | |
1810 | return q.qseries(repo, start=end, length=1, summary=opts.get('summary')) |
|
1810 | return q.qseries(repo, start=end, length=1, summary=opts.get('summary')) | |
1811 |
|
1811 | |||
@@ -1814,10 +1814,10 b' def prev(ui, repo, **opts):' | |||||
1814 | q = repo.mq |
|
1814 | q = repo.mq | |
1815 | l = len(q.applied) |
|
1815 | l = len(q.applied) | |
1816 | if l == 1: |
|
1816 | if l == 1: | |
1817 |
ui.write(_(" |
|
1817 | ui.write(_("only one patch applied\n")) | |
1818 | return 1 |
|
1818 | return 1 | |
1819 | if not l: |
|
1819 | if not l: | |
1820 |
ui.write(_(" |
|
1820 | ui.write(_("no patches applied\n")) | |
1821 | return 1 |
|
1821 | return 1 | |
1822 | return q.qseries(repo, start=l-2, length=1, status='A', |
|
1822 | return q.qseries(repo, start=l-2, length=1, status='A', | |
1823 | summary=opts.get('summary')) |
|
1823 | summary=opts.get('summary')) | |
@@ -1881,7 +1881,7 b' def refresh(ui, repo, *pats, **opts):' | |||||
1881 | message = cmdutil.logmessage(opts) |
|
1881 | message = cmdutil.logmessage(opts) | |
1882 | if opts['edit']: |
|
1882 | if opts['edit']: | |
1883 | if not q.applied: |
|
1883 | if not q.applied: | |
1884 |
ui.write(_(" |
|
1884 | ui.write(_("no patches applied\n")) | |
1885 | return 1 |
|
1885 | return 1 | |
1886 | if message: |
|
1886 | if message: | |
1887 | raise util.Abort(_('option "-e" incompatible with "-m" or "-l"')) |
|
1887 | raise util.Abort(_('option "-e" incompatible with "-m" or "-l"')) | |
@@ -2036,7 +2036,7 b' def header(ui, repo, patch=None):' | |||||
2036 | patch = q.lookup(patch) |
|
2036 | patch = q.lookup(patch) | |
2037 | else: |
|
2037 | else: | |
2038 | if not q.applied: |
|
2038 | if not q.applied: | |
2039 |
ui.write(' |
|
2039 | ui.write('no patches applied\n') | |
2040 | return 1 |
|
2040 | return 1 | |
2041 | patch = q.lookup('qtip') |
|
2041 | patch = q.lookup('qtip') | |
2042 | ph = repo.mq.readheaders(patch) |
|
2042 | ph = repo.mq.readheaders(patch) | |
@@ -2123,7 +2123,7 b' def rename(ui, repo, patch, name=None, *' | |||||
2123 | patch = q.lookup(patch) |
|
2123 | patch = q.lookup(patch) | |
2124 | else: |
|
2124 | else: | |
2125 | if not q.applied: |
|
2125 | if not q.applied: | |
2126 |
ui.write(_(' |
|
2126 | ui.write(_('no patches applied\n')) | |
2127 | return |
|
2127 | return | |
2128 | patch = q.lookup('qtip') |
|
2128 | patch = q.lookup('qtip') | |
2129 | absdest = q.join(name) |
|
2129 | absdest = q.join(name) | |
@@ -2137,7 +2137,7 b' def rename(ui, repo, patch, name=None, *' | |||||
2137 | raise util.Abort(_('A patch named %s already exists in the series file') % name) |
|
2137 | raise util.Abort(_('A patch named %s already exists in the series file') % name) | |
2138 |
|
2138 | |||
2139 | if ui.verbose: |
|
2139 | if ui.verbose: | |
2140 |
ui.write(' |
|
2140 | ui.write('renaming %s to %s\n' % (patch, name)) | |
2141 | i = q.find_series(patch) |
|
2141 | i = q.find_series(patch) | |
2142 | guards = q.guard_re.findall(q.full_series[i]) |
|
2142 | guards = q.guard_re.findall(q.full_series[i]) | |
2143 | q.full_series[i] = name + ''.join([' #' + g for g in guards]) |
|
2143 | q.full_series[i] = name + ''.join([' #' + g for g in guards]) |
@@ -2,10 +2,10 b'' | |||||
2 | % init |
|
2 | % init | |
3 | adding foo to series file |
|
3 | adding foo to series file | |
4 | applying foo |
|
4 | applying foo | |
5 |
|
|
5 | now at: foo | |
6 | adding bar to series file |
|
6 | adding bar to series file | |
7 | applying bar |
|
7 | applying bar | |
8 |
|
|
8 | now at: bar | |
9 | 430ed4828a74fa4047bc816a25500f7472ab4bfe:foo |
|
9 | 430ed4828a74fa4047bc816a25500f7472ab4bfe:foo | |
10 | 4e7abb4840c46a910f6d7b4d3c3fc7e5209e684c:bar |
|
10 | 4e7abb4840c46a910f6d7b4d3c3fc7e5209e684c:bar | |
11 | % |
|
11 | % |
@@ -213,15 +213,15 b' diff -r ef63ca68695b -r 40a904bbbe4c c' | |||||
213 | +$Id$ |
|
213 | +$Id$ | |
214 | +tests for different changenodes |
|
214 | +tests for different changenodes | |
215 | % qpop |
|
215 | % qpop | |
216 |
|
|
216 | patch queue now empty | |
217 | % qgoto - should imply qpush |
|
217 | % qgoto - should imply qpush | |
218 | applying mqtest.diff |
|
218 | applying mqtest.diff | |
219 |
|
|
219 | now at: mqtest.diff | |
220 | % cat |
|
220 | % cat | |
221 | $Id: c,v 40a904bbbe4c 1970/01/01 00:00:01 user $ |
|
221 | $Id: c,v 40a904bbbe4c 1970/01/01 00:00:01 user $ | |
222 | tests for different changenodes |
|
222 | tests for different changenodes | |
223 | % qpop and move on |
|
223 | % qpop and move on | |
224 |
|
|
224 | patch queue now empty | |
225 | % copy |
|
225 | % copy | |
226 | % kwfiles added |
|
226 | % kwfiles added | |
227 | a |
|
227 | a |
@@ -5,7 +5,7 b' tip: 0' | |||||
5 | No branch cache |
|
5 | No branch cache | |
6 |
|
6 | |||
7 | # some regular revisions |
|
7 | # some regular revisions | |
8 |
|
|
8 | patch queue now empty | |
9 | tip: 1 |
|
9 | tip: 1 | |
10 | 3f910abad313ff802d3a23a7529433872df9b3ae 1 |
|
10 | 3f910abad313ff802d3a23a7529433872df9b3ae 1 | |
11 | 3f910abad313ff802d3a23a7529433872df9b3ae bar |
|
11 | 3f910abad313ff802d3a23a7529433872df9b3ae bar | |
@@ -13,7 +13,7 b' 9539f35bdc80732cc9a3f84e46508f1ed1ec8cff' | |||||
13 |
|
13 | |||
14 | # add some mq patches |
|
14 | # add some mq patches | |
15 | applying p1 |
|
15 | applying p1 | |
16 |
|
|
16 | now at: p1 | |
17 | tip: 2 |
|
17 | tip: 2 | |
18 | 3f910abad313ff802d3a23a7529433872df9b3ae 1 |
|
18 | 3f910abad313ff802d3a23a7529433872df9b3ae 1 | |
19 | 3f910abad313ff802d3a23a7529433872df9b3ae bar |
|
19 | 3f910abad313ff802d3a23a7529433872df9b3ae bar | |
@@ -43,11 +43,11 b' branch bar: 2' | |||||
43 | qbase: 1 |
|
43 | qbase: 1 | |
44 |
|
44 | |||
45 | # detect an invalid cache |
|
45 | # detect an invalid cache | |
46 |
|
|
46 | patch queue now empty | |
47 | applying p0 |
|
47 | applying p0 | |
48 | applying p1 |
|
48 | applying p1 | |
49 | applying p2 |
|
49 | applying p2 | |
50 |
|
|
50 | now at: p2 | |
51 | tip: 3 |
|
51 | tip: 3 | |
52 | 9539f35bdc80732cc9a3f84e46508f1ed1ec8cff 0 |
|
52 | 9539f35bdc80732cc9a3f84e46508f1ed1ec8cff 0 | |
53 | 9539f35bdc80732cc9a3f84e46508f1ed1ec8cff foo |
|
53 | 9539f35bdc80732cc9a3f84e46508f1ed1ec8cff foo |
@@ -1,68 +1,68 b'' | |||||
1 | adding x |
|
1 | adding x | |
2 |
|
|
2 | patch queue now empty | |
3 | % should fail |
|
3 | % should fail | |
4 | abort: no patch named does-not-exist.patch |
|
4 | abort: no patch named does-not-exist.patch | |
5 | % should fail |
|
5 | % should fail | |
6 | abort: no patches applied |
|
6 | abort: no patches applied | |
7 | applying a.patch |
|
7 | applying a.patch | |
8 |
|
|
8 | now at: a.patch | |
9 | % should guard a.patch |
|
9 | % should guard a.patch | |
10 | % should print +a |
|
10 | % should print +a | |
11 | a.patch: +a |
|
11 | a.patch: +a | |
12 |
|
|
12 | patch queue now empty | |
13 | % should fail |
|
13 | % should fail | |
14 | cannot push 'a.patch' - guarded by ['+a'] |
|
14 | cannot push 'a.patch' - guarded by ['+a'] | |
15 | a.patch: +a |
|
15 | a.patch: +a | |
16 | % should push b.patch |
|
16 | % should push b.patch | |
17 | applying b.patch |
|
17 | applying b.patch | |
18 |
|
|
18 | now at: b.patch | |
19 |
|
|
19 | patch queue now empty | |
20 | % test selection of an empty guard |
|
20 | % test selection of an empty guard | |
21 | abort: guard cannot be an empty string |
|
21 | abort: guard cannot be an empty string | |
22 | number of unguarded, unapplied patches has changed from 2 to 3 |
|
22 | number of unguarded, unapplied patches has changed from 2 to 3 | |
23 | % should push a.patch |
|
23 | % should push a.patch | |
24 | applying a.patch |
|
24 | applying a.patch | |
25 |
|
|
25 | now at: a.patch | |
26 | % should print -a |
|
26 | % should print -a | |
27 | c.patch: -a |
|
27 | c.patch: -a | |
28 | % should skip c.patch |
|
28 | % should skip c.patch | |
29 | applying b.patch |
|
29 | applying b.patch | |
30 | skipping c.patch - guarded by '-a' |
|
30 | skipping c.patch - guarded by '-a' | |
31 |
|
|
31 | now at: b.patch | |
32 | % should display b.patch |
|
32 | % should display b.patch | |
33 | b.patch |
|
33 | b.patch | |
34 | % should push c.patch |
|
34 | % should push c.patch | |
35 | applying c.patch |
|
35 | applying c.patch | |
36 |
|
|
36 | now at: c.patch | |
37 |
|
|
37 | patch queue now empty | |
38 | guards deactivated |
|
38 | guards deactivated | |
39 | number of unguarded, unapplied patches has changed from 3 to 2 |
|
39 | number of unguarded, unapplied patches has changed from 3 to 2 | |
40 | % should push all |
|
40 | % should push all | |
41 | applying b.patch |
|
41 | applying b.patch | |
42 | applying c.patch |
|
42 | applying c.patch | |
43 |
|
|
43 | now at: c.patch | |
44 |
|
|
44 | patch queue now empty | |
45 | number of unguarded, unapplied patches has changed from 1 to 2 |
|
45 | number of unguarded, unapplied patches has changed from 1 to 2 | |
46 | % should push a.patch, not b.patch |
|
46 | % should push a.patch, not b.patch | |
47 | applying a.patch |
|
47 | applying a.patch | |
48 |
|
|
48 | now at: a.patch | |
49 | applying c.patch |
|
49 | applying c.patch | |
50 |
|
|
50 | now at: c.patch | |
51 |
|
|
51 | patch queue now empty | |
52 | % should push b.patch |
|
52 | % should push b.patch | |
53 | applying b.patch |
|
53 | applying b.patch | |
54 |
|
|
54 | now at: b.patch | |
55 | applying c.patch |
|
55 | applying c.patch | |
56 |
|
|
56 | now at: c.patch | |
57 | c.patch |
|
57 | c.patch | |
58 |
|
|
58 | patch queue now empty | |
59 | number of unguarded, unapplied patches has changed from 2 to 3 |
|
59 | number of unguarded, unapplied patches has changed from 2 to 3 | |
60 | % should push a.patch, b.patch |
|
60 | % should push a.patch, b.patch | |
61 | applying a.patch |
|
61 | applying a.patch | |
62 |
|
|
62 | now at: a.patch | |
63 | applying b.patch |
|
63 | applying b.patch | |
64 |
|
|
64 | now at: b.patch | |
65 |
|
|
65 | patch queue now empty | |
66 | number of unguarded, unapplied patches has changed from 3 to 2 |
|
66 | number of unguarded, unapplied patches has changed from 3 to 2 | |
67 | % list patches and guards |
|
67 | % list patches and guards | |
68 | a.patch: +1 +2 -3 |
|
68 | a.patch: +1 +2 -3 | |
@@ -78,15 +78,15 b' 2' | |||||
78 | 3 |
|
78 | 3 | |
79 | % should push b.patch |
|
79 | % should push b.patch | |
80 | applying b.patch |
|
80 | applying b.patch | |
81 |
|
|
81 | now at: b.patch | |
82 | applying c.patch |
|
82 | applying c.patch | |
83 |
|
|
83 | now at: c.patch | |
84 | guards deactivated |
|
84 | guards deactivated | |
85 | popping guarded patches |
|
85 | popping guarded patches | |
86 |
|
|
86 | patch queue now empty | |
87 | reapplying unguarded patches |
|
87 | reapplying unguarded patches | |
88 | applying c.patch |
|
88 | applying c.patch | |
89 |
|
|
89 | now at: c.patch | |
90 | % guards in series file: +1 +2 -3 |
|
90 | % guards in series file: +1 +2 -3 | |
91 | +1 |
|
91 | +1 | |
92 | +2 |
|
92 | +2 | |
@@ -100,7 +100,7 b' c.patch' | |||||
100 | new.patch: +1 +2 -3 |
|
100 | new.patch: +1 +2 -3 | |
101 | b.patch: +2 |
|
101 | b.patch: +2 | |
102 | c.patch: unguarded |
|
102 | c.patch: unguarded | |
103 |
|
|
103 | now at: c.patch | |
104 | % should show new.patch and b.patch as Guarded, c.patch as Applied |
|
104 | % should show new.patch and b.patch as Guarded, c.patch as Applied | |
105 | % and d.patch as Unapplied |
|
105 | % and d.patch as Unapplied | |
106 | 0 G new.patch |
|
106 | 0 G new.patch | |
@@ -112,7 +112,7 b' 0 G new.patch' | |||||
112 | 1 G b.patch |
|
112 | 1 G b.patch | |
113 | 2 A c.patch |
|
113 | 2 A c.patch | |
114 | 3 G d.patch |
|
114 | 3 G d.patch | |
115 |
|
|
115 | patch queue now empty | |
116 | new.patch: +1 +2 -3 |
|
116 | new.patch: +1 +2 -3 | |
117 | b.patch: +2 |
|
117 | b.patch: +2 | |
118 | c.patch: unguarded |
|
118 | c.patch: unguarded | |
@@ -141,7 +141,7 b' applying new.patch' | |||||
141 | skipping b.patch - guarded by ['+2'] |
|
141 | skipping b.patch - guarded by ['+2'] | |
142 | applying c.patch |
|
142 | applying c.patch | |
143 | skipping d.patch - guarded by ['+2'] |
|
143 | skipping d.patch - guarded by ['+2'] | |
144 |
|
|
144 | now at: c.patch | |
145 | % hg qapplied |
|
145 | % hg qapplied | |
146 | new.patch |
|
146 | new.patch | |
147 | c.patch |
|
147 | c.patch |
@@ -42,7 +42,7 b' diff -r ... 2' | |||||
42 | +2 |
|
42 | +2 | |
43 | 1: [mq]: 2.patch - test |
|
43 | 1: [mq]: 2.patch - test | |
44 | 0: [mq]: 1.patch - test |
|
44 | 0: [mq]: 1.patch - test | |
45 |
|
|
45 | now at: 1.patch | |
46 | ==== qnew -d -m |
|
46 | ==== qnew -d -m | |
47 | # HG changeset patch |
|
47 | # HG changeset patch | |
48 | # Date 6 0 |
|
48 | # Date 6 0 | |
@@ -127,10 +127,9 b' diff -r ... 4' | |||||
127 | 2: Four - test |
|
127 | 2: Four - test | |
128 | 1: Three (again) - test |
|
128 | 1: Three (again) - test | |
129 | 0: [mq]: 1.patch - test |
|
129 | 0: [mq]: 1.patch - test | |
130 |
|
|
130 | now at: 3.patch | |
131 | ==== qnew with HG header |
|
131 | ==== qnew with HG header | |
132 |
|
|
132 | now at: 3.patch | |
133 | Now at: 5.patch |
|
|||
134 | # HG changeset patch |
|
133 | # HG changeset patch | |
135 | # Date 10 0 |
|
134 | # Date 10 0 | |
136 | 2: imported patch 5.patch - test - 10.00 |
|
135 | 2: imported patch 5.patch - test - 10.00 | |
@@ -186,7 +185,7 b' 3: [mq]: 6.patch - jane' | |||||
186 | 2: [mq]: 5.patch - test |
|
185 | 2: [mq]: 5.patch - test | |
187 | 1: Three (again) - test |
|
186 | 1: Three (again) - test | |
188 | 0: [mq]: 1.patch - test |
|
187 | 0: [mq]: 1.patch - test | |
189 |
|
|
188 | now at: 5.patch | |
190 | ==== qnew -d |
|
189 | ==== qnew -d | |
191 | adding 7 |
|
190 | adding 7 | |
192 | # HG changeset patch |
|
191 | # HG changeset patch | |
@@ -241,7 +240,7 b' 3: [mq]: 7.patch - john' | |||||
241 | 2: [mq]: 5.patch - test |
|
240 | 2: [mq]: 5.patch - test | |
242 | 1: Three (again) - test |
|
241 | 1: Three (again) - test | |
243 | 0: [mq]: 1.patch - test |
|
242 | 0: [mq]: 1.patch - test | |
244 |
|
|
243 | now at: 7.patch | |
245 | ==== qnew -m |
|
244 | ==== qnew -m | |
246 | adding 9 |
|
245 | adding 9 | |
247 | Nine |
|
246 | Nine | |
@@ -271,14 +270,14 b' 3: [mq]: 7.patch - john' | |||||
271 | 2: [mq]: 5.patch - test |
|
270 | 2: [mq]: 5.patch - test | |
272 | 1: Three (again) - test |
|
271 | 1: Three (again) - test | |
273 | 0: [mq]: 1.patch - test |
|
272 | 0: [mq]: 1.patch - test | |
274 |
|
|
273 | now at: 7.patch | |
275 | ==== qpop -a / qpush -a |
|
274 | ==== qpop -a / qpush -a | |
276 |
|
|
275 | patch queue now empty | |
277 | applying 1.patch |
|
276 | applying 1.patch | |
278 | applying 3.patch |
|
277 | applying 3.patch | |
279 | applying 5.patch |
|
278 | applying 5.patch | |
280 | applying 7.patch |
|
279 | applying 7.patch | |
281 |
|
|
280 | now at: 7.patch | |
282 | 3: imported patch 7.patch - john - 13.00 |
|
281 | 3: imported patch 7.patch - john - 13.00 | |
283 | 2: imported patch 5.patch - test - 11.00 |
|
282 | 2: imported patch 5.patch - test - 11.00 | |
284 | 1: Three (again) - test - 8.00 |
|
283 | 1: Three (again) - test - 8.00 |
@@ -83,7 +83,7 b' hg qnew 5.patch' | |||||
83 | hg qpop |
|
83 | hg qpop | |
84 | echo "# HG changeset patch" >>.hg/patches/5.patch |
|
84 | echo "# HG changeset patch" >>.hg/patches/5.patch | |
85 | echo "# User johndoe" >>.hg/patches/5.patch |
|
85 | echo "# User johndoe" >>.hg/patches/5.patch | |
86 |
hg qpush 2>&1 | grep ' |
|
86 | hg qpush 2>&1 | grep 'now at' | |
87 | catlog 5 |
|
87 | catlog 5 | |
88 |
|
88 | |||
89 | echo ==== hg qref |
|
89 | echo ==== hg qref |
@@ -131,8 +131,8 b' 2: Three (again) - maria' | |||||
131 | 1: [mq]: 2.patch - jane |
|
131 | 1: [mq]: 2.patch - jane | |
132 | 0: [mq]: 1.patch - mary |
|
132 | 0: [mq]: 1.patch - mary | |
133 | ==== qnew with HG header |
|
133 | ==== qnew with HG header | |
134 |
|
|
134 | now at: 4.patch | |
135 |
|
|
135 | now at: 5.patch | |
136 | # HG changeset patch |
|
136 | # HG changeset patch | |
137 | # User johndoe |
|
137 | # User johndoe | |
138 | 4: imported patch 5.patch - johndoe |
|
138 | 4: imported patch 5.patch - johndoe | |
@@ -184,13 +184,13 b' 2: Three (again) - maria' | |||||
184 | 1: [mq]: 2.patch - jane |
|
184 | 1: [mq]: 2.patch - jane | |
185 | 0: [mq]: 1.patch - mary |
|
185 | 0: [mq]: 1.patch - mary | |
186 | ==== qpop -a / qpush -a |
|
186 | ==== qpop -a / qpush -a | |
187 |
|
|
187 | patch queue now empty | |
188 | applying 1.patch |
|
188 | applying 1.patch | |
189 | applying 2.patch |
|
189 | applying 2.patch | |
190 | applying 3.patch |
|
190 | applying 3.patch | |
191 | applying 4.patch |
|
191 | applying 4.patch | |
192 | applying 5.patch |
|
192 | applying 5.patch | |
193 |
|
|
193 | now at: 5.patch | |
194 | 4: imported patch 5.patch - johndeere |
|
194 | 4: imported patch 5.patch - johndeere | |
195 | 3: Four - jane |
|
195 | 3: Four - jane | |
196 | 2: Three (again) - maria |
|
196 | 2: Three (again) - maria |
@@ -8,9 +8,9 b' a' | |||||
8 | b |
|
8 | b | |
9 | merging with queue at: .hg/patches.1 |
|
9 | merging with queue at: .hg/patches.1 | |
10 | applying rm_a |
|
10 | applying rm_a | |
11 |
|
|
11 | now at: rm_a | |
12 | b |
|
12 | b | |
13 |
|
|
13 | patch queue now empty | |
14 |
|
14 | |||
15 | % init t2 |
|
15 | % init t2 | |
16 | adding a |
|
16 | adding a | |
@@ -21,4 +21,4 b' 1 files updated, 0 files merged, 0 files' | |||||
21 | merging with queue at refqueue |
|
21 | merging with queue at refqueue | |
22 | (working directory not at tip) |
|
22 | (working directory not at tip) | |
23 | applying patcha |
|
23 | applying patcha | |
24 |
|
|
24 | now at: patcha |
@@ -1,12 +1,12 b'' | |||||
1 | adding b |
|
1 | adding b | |
2 |
|
|
2 | patch queue now empty | |
3 | % push patch with missing target |
|
3 | % push patch with missing target | |
4 | applying changeb |
|
4 | applying changeb | |
5 | unable to find 'b' for patching |
|
5 | unable to find 'b' for patching | |
6 | 2 out of 2 hunks FAILED -- saving rejects to file b.rej |
|
6 | 2 out of 2 hunks FAILED -- saving rejects to file b.rej | |
7 | patch failed, unable to continue (try -v) |
|
7 | patch failed, unable to continue (try -v) | |
8 | patch failed, rejects left in working dir |
|
8 | patch failed, rejects left in working dir | |
9 |
|
|
9 | errors during apply, please fix and refresh changeb | |
10 | % display added files |
|
10 | % display added files | |
11 | a |
|
11 | a | |
12 | c |
|
12 | c | |
@@ -26,7 +26,7 b' c' | |||||
26 | +c |
|
26 | +c | |
27 | +c |
|
27 | +c | |
28 | adding b |
|
28 | adding b | |
29 |
|
|
29 | patch queue now empty | |
30 | % push git patch with missing target |
|
30 | % push git patch with missing target | |
31 | applying changeb |
|
31 | applying changeb | |
32 | unable to find 'b' for patching |
|
32 | unable to find 'b' for patching | |
@@ -35,7 +35,7 b' patch failed, unable to continue (try -v' | |||||
35 | b: No such file or directory |
|
35 | b: No such file or directory | |
36 | b not tracked! |
|
36 | b not tracked! | |
37 | patch failed, rejects left in working dir |
|
37 | patch failed, rejects left in working dir | |
38 |
|
|
38 | errors during apply, please fix and refresh changeb | |
39 | ? b.rej |
|
39 | ? b.rej | |
40 | % display added files |
|
40 | % display added files | |
41 | a |
|
41 | a | |
@@ -49,6 +49,6 b' Jc${No0000400IC2' | |||||
49 |
|
49 | |||
50 | % test push creating directory during git copy or rename |
|
50 | % test push creating directory during git copy or rename | |
51 | adding a |
|
51 | adding a | |
52 |
|
|
52 | patch queue now empty | |
53 | applying patch |
|
53 | applying patch | |
54 |
|
|
54 | now at: patch |
@@ -13,7 +13,7 b' 0: main: one added.' | |||||
13 | 1: main: one updated. |
|
13 | 1: main: one updated. | |
14 | ====== Setup queue |
|
14 | ====== Setup queue | |
15 | adding two |
|
15 | adding two | |
16 |
|
|
16 | patch queue now empty | |
17 | ====== Bundle queue |
|
17 | ====== Bundle queue | |
18 | 1 changesets found |
|
18 | 1 changesets found | |
19 | ====== Clone base |
|
19 | ====== Clone base |
@@ -25,7 +25,7 b' 3 files updated, 0 files merged, 0 files' | |||||
25 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
25 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
26 | a |
|
26 | a | |
27 | applying b.patch |
|
27 | applying b.patch | |
28 |
|
|
28 | now at: b.patch | |
29 | imported patch b.patch |
|
29 | imported patch b.patch | |
30 | a |
|
30 | a | |
31 | % test with normal collection |
|
31 | % test with normal collection | |
@@ -50,7 +50,7 b' 3 files updated, 0 files merged, 0 files' | |||||
50 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
50 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
51 | a |
|
51 | a | |
52 | applying b.patch |
|
52 | applying b.patch | |
53 |
|
|
53 | now at: b.patch | |
54 | imported patch b.patch |
|
54 | imported patch b.patch | |
55 | a |
|
55 | a | |
56 | % test with old-style collection |
|
56 | % test with old-style collection | |
@@ -75,6 +75,6 b' 3 files updated, 0 files merged, 0 files' | |||||
75 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
75 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
76 | a |
|
76 | a | |
77 | applying b.patch |
|
77 | applying b.patch | |
78 |
|
|
78 | now at: b.patch | |
79 | imported patch b.patch |
|
79 | imported patch b.patch | |
80 | a |
|
80 | a |
@@ -1,14 +1,14 b'' | |||||
1 | adding base |
|
1 | adding base | |
2 | abort: qdelete requires at least one revision or patch name |
|
2 | abort: qdelete requires at least one revision or patch name | |
3 | abort: cannot delete applied patch c |
|
3 | abort: cannot delete applied patch c | |
4 |
|
|
4 | now at: b | |
5 | a |
|
5 | a | |
6 | b |
|
6 | b | |
7 | a |
|
7 | a | |
8 | b |
|
8 | b | |
9 | series |
|
9 | series | |
10 | status |
|
10 | status | |
11 |
|
|
11 | now at: a | |
12 | a |
|
12 | a | |
13 | b |
|
13 | b | |
14 | series |
|
14 | series | |
@@ -27,10 +27,10 b' abort: no revisions specified' | |||||
27 | no patches applied |
|
27 | no patches applied | |
28 | abort: revision 0 is not managed |
|
28 | abort: revision 0 is not managed | |
29 | abort: cannot delete revision 2 above applied patches |
|
29 | abort: cannot delete revision 2 above applied patches | |
30 |
|
|
30 | now at: b | |
31 | abort: unknown revision 'c'! |
|
31 | abort: unknown revision 'c'! | |
32 | applying c |
|
32 | applying c | |
33 |
|
|
33 | now at: c | |
34 | c |
|
34 | c | |
35 | 3 imported patch c |
|
35 | 3 imported patch c | |
36 | 2 [mq]: b |
|
36 | 2 [mq]: b |
@@ -26,7 +26,7 b' diff -r 67e992f2c4f3 base' | |||||
26 | +patched |
|
26 | +patched | |
27 | % revert |
|
27 | % revert | |
28 | % qpop |
|
28 | % qpop | |
29 |
|
|
29 | patch queue now empty | |
30 | % qdelete mqbase |
|
30 | % qdelete mqbase | |
31 | % commit 2 |
|
31 | % commit 2 | |
32 | adding lines |
|
32 | adding lines |
@@ -1,21 +1,21 b'' | |||||
1 | adding a |
|
1 | adding a | |
2 |
|
|
2 | now at: a.patch | |
3 | applying b.patch |
|
3 | applying b.patch | |
4 | applying c.patch |
|
4 | applying c.patch | |
5 |
|
|
5 | now at: c.patch | |
6 |
|
|
6 | now at: b.patch | |
7 |
|
7 | |||
8 | % Using index |
|
8 | % Using index | |
9 |
|
|
9 | now at: a.patch | |
10 | applying b.patch |
|
10 | applying b.patch | |
11 | applying c.patch |
|
11 | applying c.patch | |
12 |
|
|
12 | now at: c.patch | |
13 |
|
13 | |||
14 | % No warnings when using index |
|
14 | % No warnings when using index | |
15 |
|
|
15 | now at: b.patch | |
16 | applying c.patch |
|
16 | applying c.patch | |
17 | applying bug314159 |
|
17 | applying bug314159 | |
18 |
|
|
18 | now at: bug314159 | |
19 |
|
19 | |||
20 | % Detect ambiguous non-index |
|
20 | % Detect ambiguous non-index | |
21 | patch name "14" is ambiguous: |
|
21 | patch name "14" is ambiguous: |
@@ -6,19 +6,19 b' url.diff' | |||||
6 | % import patch that already exists |
|
6 | % import patch that already exists | |
7 | abort: patch "url.diff" already exists |
|
7 | abort: patch "url.diff" already exists | |
8 | applying url.diff |
|
8 | applying url.diff | |
9 |
|
|
9 | now at: url.diff | |
10 | foo |
|
10 | foo | |
11 |
|
|
11 | patch queue now empty | |
12 | % qimport -f |
|
12 | % qimport -f | |
13 | adding url.diff to series file |
|
13 | adding url.diff to series file | |
14 | applying url.diff |
|
14 | applying url.diff | |
15 |
|
|
15 | now at: url.diff | |
16 | foo2 |
|
16 | foo2 | |
17 |
|
|
17 | patch queue now empty | |
18 | % build diff with CRLF |
|
18 | % build diff with CRLF | |
19 | adding b |
|
19 | adding b | |
20 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
20 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
21 | % qimport CRLF diff |
|
21 | % qimport CRLF diff | |
22 | adding b.diff to series file |
|
22 | adding b.diff to series file | |
23 | applying b.diff |
|
23 | applying b.diff | |
24 |
|
|
24 | now at: b.diff |
@@ -20,7 +20,7 b' foo bar' | |||||
20 | abort: patch "first.patch" already exists |
|
20 | abort: patch "first.patch" already exists | |
21 | abort: patch "first.patch" already exists |
|
21 | abort: patch "first.patch" already exists | |
22 | % qnew -f from a subdirectory |
|
22 | % qnew -f from a subdirectory | |
23 |
|
|
23 | patch queue now empty | |
24 | adding d/b |
|
24 | adding d/b | |
25 | M d/b |
|
25 | M d/b | |
26 | diff --git a/d/b b/d/b |
|
26 | diff --git a/d/b b/d/b |
@@ -1,5 +1,5 b'' | |||||
1 | adding foo |
|
1 | adding foo | |
2 |
|
|
2 | patch queue now empty | |
3 | applying patch1 |
|
3 | applying patch1 | |
4 | applying patch2 |
|
4 | applying patch2 | |
5 | applying bad-patch |
|
5 | applying bad-patch |
@@ -1,7 +1,7 b'' | |||||
1 | ======================= |
|
1 | ======================= | |
2 | Should fail if no patches applied |
|
2 | Should fail if no patches applied | |
3 |
|
|
3 | no patches applied | |
4 |
|
|
4 | no patches applied | |
5 | ======================= |
|
5 | ======================= | |
6 | Should display 'First commit message' |
|
6 | Should display 'First commit message' | |
7 | description: |
|
7 | description: |
@@ -1,10 +1,10 b'' | |||||
1 | a -> a not a symlink |
|
1 | a -> a not a symlink | |
2 | a -> b |
|
2 | a -> b | |
3 |
|
|
3 | now at: base.patch | |
4 | applying symlink.patch |
|
4 | applying symlink.patch | |
5 |
|
|
5 | now at: symlink.patch | |
6 | a -> b |
|
6 | a -> b | |
7 |
|
|
7 | now at: symlink.patch | |
8 | applying removesl.patch |
|
8 | applying removesl.patch | |
9 |
|
|
9 | now at: removesl.patch | |
10 | C b |
|
10 | C b |
@@ -108,28 +108,28 b' working dir diff:' | |||||
108 | a |
|
108 | a | |
109 | +a |
|
109 | +a | |
110 | % qpop |
|
110 | % qpop | |
111 |
|
|
111 | patch queue now empty | |
112 | % qpush |
|
112 | % qpush | |
113 | applying test.patch |
|
113 | applying test.patch | |
114 |
|
|
114 | now at: test.patch | |
115 | % pop/push outside repo |
|
115 | % pop/push outside repo | |
116 |
|
|
116 | patch queue now empty | |
117 | applying test.patch |
|
117 | applying test.patch | |
118 |
|
|
118 | now at: test.patch | |
119 | % qrefresh in subdir |
|
119 | % qrefresh in subdir | |
120 | % pop/push -a in subdir |
|
120 | % pop/push -a in subdir | |
121 |
|
|
121 | patch queue now empty | |
122 | applying test.patch |
|
122 | applying test.patch | |
123 | applying test2.patch |
|
123 | applying test2.patch | |
124 |
|
|
124 | now at: test2.patch | |
125 | % qseries |
|
125 | % qseries | |
126 | test.patch |
|
126 | test.patch | |
127 | test2.patch |
|
127 | test2.patch | |
128 |
|
|
128 | now at: test.patch | |
129 | 0 A test.patch: foo bar |
|
129 | 0 A test.patch: foo bar | |
130 | 1 U test2.patch: |
|
130 | 1 U test2.patch: | |
131 | applying test2.patch |
|
131 | applying test2.patch | |
132 |
|
|
132 | now at: test2.patch | |
133 | % qapplied |
|
133 | % qapplied | |
134 | test.patch |
|
134 | test.patch | |
135 | test2.patch |
|
135 | test2.patch | |
@@ -138,11 +138,11 b' test2.patch' | |||||
138 | % qprev |
|
138 | % qprev | |
139 | test.patch |
|
139 | test.patch | |
140 | % qnext |
|
140 | % qnext | |
141 |
|
|
141 | all patches applied | |
142 | % pop, qnext, qprev, qapplied |
|
142 | % pop, qnext, qprev, qapplied | |
143 |
|
|
143 | now at: test.patch | |
144 | test2.patch |
|
144 | test2.patch | |
145 |
|
|
145 | only one patch applied | |
146 | test.patch |
|
146 | test.patch | |
147 | % commit should fail |
|
147 | % commit should fail | |
148 | abort: cannot commit over an applied mq patch |
|
148 | abort: cannot commit over an applied mq patch | |
@@ -155,19 +155,19 b' abort: cannot import over an applied pat' | |||||
155 | test2.patch |
|
155 | test2.patch | |
156 | % qpush/qpop with index |
|
156 | % qpush/qpop with index | |
157 | applying test2.patch |
|
157 | applying test2.patch | |
158 |
|
|
158 | now at: test2.patch | |
159 |
|
|
159 | now at: test.patch | |
160 | applying test1b.patch |
|
160 | applying test1b.patch | |
161 |
|
|
161 | now at: test1b.patch | |
162 | applying test2.patch |
|
162 | applying test2.patch | |
163 |
|
|
163 | now at: test2.patch | |
164 |
|
|
164 | now at: test1b.patch | |
165 |
|
|
165 | now at: test.patch | |
166 | applying test1b.patch |
|
166 | applying test1b.patch | |
167 | applying test2.patch |
|
167 | applying test2.patch | |
168 |
|
|
168 | now at: test2.patch | |
169 | % push should succeed |
|
169 | % push should succeed | |
170 |
|
|
170 | patch queue now empty | |
171 | pushing to ../../k |
|
171 | pushing to ../../k | |
172 | searching for changes |
|
172 | searching for changes | |
173 | adding changesets |
|
173 | adding changesets | |
@@ -178,9 +178,9 b' added 1 changesets with 1 changes to 1 f' | |||||
178 | applying test.patch |
|
178 | applying test.patch | |
179 | applying test1b.patch |
|
179 | applying test1b.patch | |
180 | applying test2.patch |
|
180 | applying test2.patch | |
181 |
|
|
181 | now at: test2.patch | |
182 | % pops all patches and succeeds |
|
182 | % pops all patches and succeeds | |
183 |
|
|
183 | patch queue now empty | |
184 | qpop -a succeeds |
|
184 | qpop -a succeeds | |
185 | % does nothing and succeeds |
|
185 | % does nothing and succeeds | |
186 | no patches applied |
|
186 | no patches applied | |
@@ -190,15 +190,15 b' no patches applied' | |||||
190 | qpop fails |
|
190 | qpop fails | |
191 | % pushes a patch and succeeds |
|
191 | % pushes a patch and succeeds | |
192 | applying test.patch |
|
192 | applying test.patch | |
193 |
|
|
193 | now at: test.patch | |
194 | qpush succeeds |
|
194 | qpush succeeds | |
195 | % pops a patch and succeeds |
|
195 | % pops a patch and succeeds | |
196 |
|
|
196 | patch queue now empty | |
197 | qpop succeeds |
|
197 | qpop succeeds | |
198 | % pushes up to test1b.patch and succeeds |
|
198 | % pushes up to test1b.patch and succeeds | |
199 | applying test.patch |
|
199 | applying test.patch | |
200 | applying test1b.patch |
|
200 | applying test1b.patch | |
201 |
|
|
201 | now at: test1b.patch | |
202 | qpush test1b.patch succeeds |
|
202 | qpush test1b.patch succeeds | |
203 | % does nothing and succeeds |
|
203 | % does nothing and succeeds | |
204 | qpush: test1b.patch is already at the top |
|
204 | qpush: test1b.patch is already at the top | |
@@ -213,12 +213,12 b' abort: cannot push to a previous patch: ' | |||||
213 | abort: patch test2.patch is not applied |
|
213 | abort: patch test2.patch is not applied | |
214 | qpop test2.patch fails |
|
214 | qpop test2.patch fails | |
215 | % pops up to test.patch and succeeds |
|
215 | % pops up to test.patch and succeeds | |
216 |
|
|
216 | now at: test.patch | |
217 | qpop test.patch succeeds |
|
217 | qpop test.patch succeeds | |
218 | % pushes all patches and succeeds |
|
218 | % pushes all patches and succeeds | |
219 | applying test1b.patch |
|
219 | applying test1b.patch | |
220 | applying test2.patch |
|
220 | applying test2.patch | |
221 |
|
|
221 | now at: test2.patch | |
222 | qpush -a succeeds |
|
222 | qpush -a succeeds | |
223 | % does nothing and succeeds |
|
223 | % does nothing and succeeds | |
224 | all patches are currently applied |
|
224 | all patches are currently applied | |
@@ -269,14 +269,14 b' diff -r cb9a9f314b8b b/f' | |||||
269 | +f |
|
269 | +f | |
270 | M a |
|
270 | M a | |
271 | % qpush failure |
|
271 | % qpush failure | |
272 |
|
|
272 | patch queue now empty | |
273 | applying foo |
|
273 | applying foo | |
274 | applying bar |
|
274 | applying bar | |
275 | file foo already exists |
|
275 | file foo already exists | |
276 | 1 out of 1 hunks FAILED -- saving rejects to file foo.rej |
|
276 | 1 out of 1 hunks FAILED -- saving rejects to file foo.rej | |
277 | patch failed, unable to continue (try -v) |
|
277 | patch failed, unable to continue (try -v) | |
278 | patch failed, rejects left in working dir |
|
278 | patch failed, rejects left in working dir | |
279 |
|
|
279 | errors during apply, please fix and refresh bar | |
280 | ? foo |
|
280 | ? foo | |
281 | ? foo.rej |
|
281 | ? foo.rej | |
282 | % mq tags |
|
282 | % mq tags | |
@@ -284,7 +284,7 b' 0 qparent' | |||||
284 | 1 qbase foo |
|
284 | 1 qbase foo | |
285 | 2 qtip bar tip |
|
285 | 2 qtip bar tip | |
286 | % bad node in status |
|
286 | % bad node in status | |
287 |
|
|
287 | now at: foo | |
288 | changeset: 0:cb9a9f314b8b |
|
288 | changeset: 0:cb9a9f314b8b | |
289 | mq status file refers to unknown node |
|
289 | mq status file refers to unknown node | |
290 | tag: tip |
|
290 | tag: tip | |
@@ -308,9 +308,9 b' copy file' | |||||
308 | diff --git a/new b/copy |
|
308 | diff --git a/new b/copy | |
309 | copy from new |
|
309 | copy from new | |
310 | copy to copy |
|
310 | copy to copy | |
311 |
|
|
311 | now at: new | |
312 | applying copy |
|
312 | applying copy | |
313 |
|
|
313 | now at: copy | |
314 | diff --git a/new b/copy |
|
314 | diff --git a/new b/copy | |
315 | copy from new |
|
315 | copy from new | |
316 | copy to copy |
|
316 | copy to copy | |
@@ -325,10 +325,10 b' adding changesets' | |||||
325 | adding manifests |
|
325 | adding manifests | |
326 | adding file changes |
|
326 | adding file changes | |
327 | added 1 changesets with 1 changes to 1 files |
|
327 | added 1 changesets with 1 changes to 1 files | |
328 |
|
|
328 | patch queue now empty | |
329 | (working directory not at tip) |
|
329 | (working directory not at tip) | |
330 | applying bar |
|
330 | applying bar | |
331 |
|
|
331 | now at: bar | |
332 | diff --git a/bar b/bar |
|
332 | diff --git a/bar b/bar | |
333 | new file mode 100644 |
|
333 | new file mode 100644 | |
334 | --- /dev/null |
|
334 | --- /dev/null | |
@@ -359,10 +359,10 b' adding changesets' | |||||
359 | adding manifests |
|
359 | adding manifests | |
360 | adding file changes |
|
360 | adding file changes | |
361 | added 1 changesets with 1 changes to 1 files |
|
361 | added 1 changesets with 1 changes to 1 files | |
362 |
|
|
362 | patch queue now empty | |
363 | (working directory not at tip) |
|
363 | (working directory not at tip) | |
364 | applying bar |
|
364 | applying bar | |
365 |
|
|
365 | now at: bar | |
366 | diff --git a/foo b/bleh |
|
366 | diff --git a/foo b/bleh | |
367 | rename from foo |
|
367 | rename from foo | |
368 | rename to bleh |
|
368 | rename to bleh | |
@@ -386,16 +386,16 b' 3 barney (foo)' | |||||
386 | % refresh omitting an added file |
|
386 | % refresh omitting an added file | |
387 | C newfile |
|
387 | C newfile | |
388 | A newfile |
|
388 | A newfile | |
389 |
|
|
389 | now at: bar | |
390 | % create a git patch |
|
390 | % create a git patch | |
391 | diff --git a/alexander b/alexander |
|
391 | diff --git a/alexander b/alexander | |
392 | % create a git binary patch |
|
392 | % create a git binary patch | |
393 | 8ba2a2f3e77b55d03051ff9c24ad65e7 bucephalus |
|
393 | 8ba2a2f3e77b55d03051ff9c24ad65e7 bucephalus | |
394 | diff --git a/bucephalus b/bucephalus |
|
394 | diff --git a/bucephalus b/bucephalus | |
395 | % check binary patches can be popped and pushed |
|
395 | % check binary patches can be popped and pushed | |
396 |
|
|
396 | now at: addalexander | |
397 | applying addbucephalus |
|
397 | applying addbucephalus | |
398 |
|
|
398 | now at: addbucephalus | |
399 | 8ba2a2f3e77b55d03051ff9c24ad65e7 bucephalus |
|
399 | 8ba2a2f3e77b55d03051ff9c24ad65e7 bucephalus | |
400 | % strip again |
|
400 | % strip again | |
401 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
401 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
@@ -461,7 +461,7 b' main repo:' | |||||
461 | rev 0: add foo |
|
461 | rev 0: add foo | |
462 | patch repo: |
|
462 | patch repo: | |
463 | rev 0: checkpoint |
|
463 | rev 0: checkpoint | |
464 |
|
|
464 | patch queue now empty | |
465 | main repo: |
|
465 | main repo: | |
466 | rev 0: add foo |
|
466 | rev 0: add foo | |
467 | patch repo: |
|
467 | patch repo: | |
@@ -475,13 +475,13 b' patch repo:' | |||||
475 | rev 0: checkpoint |
|
475 | rev 0: checkpoint | |
476 | % test applying on an empty file (issue 1033) |
|
476 | % test applying on an empty file (issue 1033) | |
477 | adding a |
|
477 | adding a | |
478 |
|
|
478 | patch queue now empty | |
479 | applying changea |
|
479 | applying changea | |
480 |
|
|
480 | now at: changea | |
481 | % test qpush with --force, issue1087 |
|
481 | % test qpush with --force, issue1087 | |
482 | adding bye.txt |
|
482 | adding bye.txt | |
483 | adding hello.txt |
|
483 | adding hello.txt | |
484 |
|
|
484 | patch queue now empty | |
485 | % qpush should fail, local changes |
|
485 | % qpush should fail, local changes | |
486 | abort: local changes found, refresh first |
|
486 | abort: local changes found, refresh first | |
487 | % apply force, should not discard changes with empty patch |
|
487 | % apply force, should not discard changes with empty patch | |
@@ -489,7 +489,7 b' applying empty' | |||||
489 | patch: **** Only garbage was found in the patch input. |
|
489 | patch: **** Only garbage was found in the patch input. | |
490 | patch failed, unable to continue (try -v) |
|
490 | patch failed, unable to continue (try -v) | |
491 | patch empty is empty |
|
491 | patch empty is empty | |
492 |
|
|
492 | now at: empty | |
493 | diff -r bf5fc3f07a0a hello.txt |
|
493 | diff -r bf5fc3f07a0a hello.txt | |
494 | --- a/hello.txt |
|
494 | --- a/hello.txt | |
495 | +++ b/hello.txt |
|
495 | +++ b/hello.txt | |
@@ -512,12 +512,12 b' date: Thu Jan 01 00:00:00 1970 +0' | |||||
512 | summary: imported patch empty |
|
512 | summary: imported patch empty | |
513 |
|
513 | |||
514 |
|
514 | |||
515 |
|
|
515 | patch queue now empty | |
516 | % qpush should fail, local changes |
|
516 | % qpush should fail, local changes | |
517 | abort: local changes found, refresh first |
|
517 | abort: local changes found, refresh first | |
518 | % apply force, should discard changes in hello, but not bye |
|
518 | % apply force, should discard changes in hello, but not bye | |
519 | applying empty |
|
519 | applying empty | |
520 |
|
|
520 | now at: empty | |
521 | M bye.txt |
|
521 | M bye.txt | |
522 | diff -r ba252371dbc1 bye.txt |
|
522 | diff -r ba252371dbc1 bye.txt | |
523 | --- a/bye.txt |
|
523 | --- a/bye.txt | |
@@ -541,4 +541,4 b' diff -r 9ecee4f634e3 hello.txt' | |||||
541 | % test popping revisions not in working dir ancestry |
|
541 | % test popping revisions not in working dir ancestry | |
542 | 0 A empty |
|
542 | 0 A empty | |
543 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
543 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
544 |
|
|
544 | patch queue now empty |
General Comments 0
You need to be logged in to leave comments.
Login now