Mercurial > hg
annotate tests/test-mq.out @ 6356:b34b876d1f6f
test-remove: make it pass on Mac OS X 10.5
author | Florent Guillaume <fg@nuxeo.com> |
---|---|
date | Sat, 22 Mar 2008 21:13:22 +0100 |
parents | 949e607ac544 |
children | 8c4cd80afd3e 3182602fa1fb |
rev | line source |
---|---|
2729 | 1 % help |
2 mq extension - patch management and development | |
3 | |
4 This extension lets you work with a stack of patches in a Mercurial | |
5 repository. It manages two stacks of patches - all known patches, and | |
6 applied patches (subset of known patches). | |
7 | |
8 Known patches are represented as patch files in the .hg/patches | |
9 directory. Applied patches are both patch files and changesets. | |
10 | |
11 Common tasks (use "hg help command" for more details): | |
12 | |
13 prepare repository to work with patches qinit | |
14 create new patch qnew | |
15 import existing patch qimport | |
16 | |
17 print patch series qseries | |
18 print applied patches qapplied | |
19 print name of top applied patch qtop | |
20 | |
21 add known patch to applied stack qpush | |
22 remove patch from applied stack qpop | |
23 refresh contents of top applied patch qrefresh | |
24 | |
4315
bc6f5a1d8b7b
Add a pointer to "hg -v help" to the bottom of hg help {,cmd} output
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4173
diff
changeset
|
25 list of commands: |
2729 | 26 |
27 qapplied print the patches already applied | |
28 qclone clone main and patch repository at same time | |
29 qcommit commit changes in the queue repository | |
2910
41f8b041893b
Adjusted test to changed help output.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
2852
diff
changeset
|
30 qdelete remove patches from queue |
2729 | 31 qdiff diff of the current patch |
2748
752b9475a700
New mq command qfold: Merge patches into the current patch.
Brendan Cully <brendan@kublai.com>
parents:
2747
diff
changeset
|
32 qfold fold the named patches into the current patch |
4432
905397be7688
mq: add qgoto command.
Bryan O'Sullivan <bos@serpentine.com>
parents:
4325
diff
changeset
|
33 qgoto push or pop patches until named patch is at top of stack |
2821
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2758
diff
changeset
|
34 qguard set or print guards for a patch |
2747
0016fc748f61
Add command qheader to display the header of a given patch.
Brendan Cully <brendan@kublai.com>
parents:
2729
diff
changeset
|
35 qheader Print the header of the topmost or specified patch |
2729 | 36 qimport import a patch |
37 qinit init a new queue repository | |
38 qnew create a new patch | |
39 qnext print the name of the next patch | |
40 qpop pop the current patch off the stack | |
41 qprev print the name of the previous patch | |
42 qpush push the next patch onto the stack | |
43 qrefresh update the current patch | |
2750
8c814c1ab31e
New self-explanatory command qrename.
Brendan Cully <brendan@kublai.com>
parents:
2748
diff
changeset
|
44 qrename rename a patch |
2729 | 45 qrestore restore the queue state saved by a rev |
46 qsave save current queue state | |
2821
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2758
diff
changeset
|
47 qselect set or print guarded patches to push |
2729 | 48 qseries print the entire series file |
49 qtop print the name of the current patch | |
50 qunapplied print the patches not yet applied | |
51 strip strip a revision and all later revs on the same branch | |
4315
bc6f5a1d8b7b
Add a pointer to "hg -v help" to the bottom of hg help {,cmd} output
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4173
diff
changeset
|
52 |
bc6f5a1d8b7b
Add a pointer to "hg -v help" to the bottom of hg help {,cmd} output
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4173
diff
changeset
|
53 use "hg -v help mq" to show aliases and global options |
2729 | 54 adding a |
6338
0750f11152fe
clone: print "updating working directory" status message
Adrian Buehlmann <adrian@cadifra.com>
parents:
6336
diff
changeset
|
55 updating working directory |
2848
307439d6fede
mq: do not allow to push from repo with patches applied
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2846
diff
changeset
|
56 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
2729 | 57 adding b/z |
58 % qinit | |
59 % -R qinit | |
60 % qinit -c | |
61 A .hgignore | |
62 A series | |
5981
ca2af0c81c9a
mq: don't allow patches with some reserved names
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
5979
diff
changeset
|
63 % qnew should refuse bad patch names |
ca2af0c81c9a
mq: don't allow patches with some reserved names
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
5979
diff
changeset
|
64 abort: "series" cannot be used as the name of a patch |
ca2af0c81c9a
mq: don't allow patches with some reserved names
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
5979
diff
changeset
|
65 abort: "status" cannot be used as the name of a patch |
ca2af0c81c9a
mq: don't allow patches with some reserved names
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
5979
diff
changeset
|
66 abort: "guards" cannot be used as the name of a patch |
ca2af0c81c9a
mq: don't allow patches with some reserved names
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
5979
diff
changeset
|
67 abort: ".hgignore" cannot be used as the name of a patch |
2729 | 68 % qnew implies add |
69 A .hgignore | |
70 A series | |
71 A test.patch | |
4071
165abe554c80
mq: qinit -c creates a repo even after a regular qinit
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4065
diff
changeset
|
72 % qinit; qinit -c |
165abe554c80
mq: qinit -c creates a repo even after a regular qinit
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4065
diff
changeset
|
73 .hgignore: |
6034
83633602e2c5
qinit -c: add ^\.hg and ^\.mq to .hgignore
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
5981
diff
changeset
|
74 ^\.hg |
83633602e2c5
qinit -c: add ^\.hg and ^\.mq to .hgignore
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
5981
diff
changeset
|
75 ^\.mq |
4071
165abe554c80
mq: qinit -c creates a repo even after a regular qinit
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4065
diff
changeset
|
76 syntax: glob |
165abe554c80
mq: qinit -c creates a repo even after a regular qinit
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4065
diff
changeset
|
77 status |
165abe554c80
mq: qinit -c creates a repo even after a regular qinit
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4065
diff
changeset
|
78 guards |
165abe554c80
mq: qinit -c creates a repo even after a regular qinit
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4065
diff
changeset
|
79 series: |
165abe554c80
mq: qinit -c creates a repo even after a regular qinit
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4065
diff
changeset
|
80 abort: repository already exists! |
165abe554c80
mq: qinit -c creates a repo even after a regular qinit
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4065
diff
changeset
|
81 % qinit; <stuff>; qinit -c |
4232
0d51eb296fb9
Merge with crew-stable
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4219
diff
changeset
|
82 adding .hg/patches/A |
0d51eb296fb9
Merge with crew-stable
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4219
diff
changeset
|
83 adding .hg/patches/B |
4071
165abe554c80
mq: qinit -c creates a repo even after a regular qinit
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4065
diff
changeset
|
84 A .hgignore |
165abe554c80
mq: qinit -c creates a repo even after a regular qinit
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4065
diff
changeset
|
85 A A |
165abe554c80
mq: qinit -c creates a repo even after a regular qinit
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4065
diff
changeset
|
86 A B |
165abe554c80
mq: qinit -c creates a repo even after a regular qinit
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4065
diff
changeset
|
87 A series |
165abe554c80
mq: qinit -c creates a repo even after a regular qinit
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4065
diff
changeset
|
88 .hgignore: |
165abe554c80
mq: qinit -c creates a repo even after a regular qinit
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4065
diff
changeset
|
89 status |
165abe554c80
mq: qinit -c creates a repo even after a regular qinit
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4065
diff
changeset
|
90 bleh |
165abe554c80
mq: qinit -c creates a repo even after a regular qinit
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4065
diff
changeset
|
91 series: |
165abe554c80
mq: qinit -c creates a repo even after a regular qinit
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4065
diff
changeset
|
92 A |
165abe554c80
mq: qinit -c creates a repo even after a regular qinit
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4065
diff
changeset
|
93 B |
5534
61c230f81068
mq: avoid qnew committing everything on invalid paths (issue 803)
Patrick Mezard <pmezard@gmail.com>
parents:
5294
diff
changeset
|
94 % qnew with uncommitted changes |
61c230f81068
mq: avoid qnew committing everything on invalid paths (issue 803)
Patrick Mezard <pmezard@gmail.com>
parents:
5294
diff
changeset
|
95 abort: local changes found, refresh first |
61c230f81068
mq: avoid qnew committing everything on invalid paths (issue 803)
Patrick Mezard <pmezard@gmail.com>
parents:
5294
diff
changeset
|
96 A somefile |
61c230f81068
mq: avoid qnew committing everything on invalid paths (issue 803)
Patrick Mezard <pmezard@gmail.com>
parents:
5294
diff
changeset
|
97 % qnew with uncommitted changes and missing file (issue 803) |
61c230f81068
mq: avoid qnew committing everything on invalid paths (issue 803)
Patrick Mezard <pmezard@gmail.com>
parents:
5294
diff
changeset
|
98 someotherfile: No such file or directory |
61c230f81068
mq: avoid qnew committing everything on invalid paths (issue 803)
Patrick Mezard <pmezard@gmail.com>
parents:
5294
diff
changeset
|
99 A somefile |
61c230f81068
mq: avoid qnew committing everything on invalid paths (issue 803)
Patrick Mezard <pmezard@gmail.com>
parents:
5294
diff
changeset
|
100 issue803.patch |
61c230f81068
mq: avoid qnew committing everything on invalid paths (issue 803)
Patrick Mezard <pmezard@gmail.com>
parents:
5294
diff
changeset
|
101 Patch queue now empty |
2729 | 102 % qnew -m |
103 foo bar | |
104 % qrefresh | |
105 foo bar | |
106 | |
107 diff -r xa | |
108 --- a/a | |
109 +++ b/a | |
5863
3d1f9dcecdea
diff: don't show function name by default
Matt Mackall <mpm@selenic.com>
parents:
5764
diff
changeset
|
110 @@ -1,1 +1,2 @@ |
2729 | 111 a |
112 +a | |
4173
7307d2e98b32
fix qrefresh'ing an empty patch
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4090
diff
changeset
|
113 % empty qrefresh |
7307d2e98b32
fix qrefresh'ing an empty patch
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4090
diff
changeset
|
114 revision: |
7307d2e98b32
fix qrefresh'ing an empty patch
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4090
diff
changeset
|
115 patch: |
7307d2e98b32
fix qrefresh'ing an empty patch
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4090
diff
changeset
|
116 foo bar |
7307d2e98b32
fix qrefresh'ing an empty patch
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4090
diff
changeset
|
117 |
7307d2e98b32
fix qrefresh'ing an empty patch
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4090
diff
changeset
|
118 working dir diff: |
7307d2e98b32
fix qrefresh'ing an empty patch
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4090
diff
changeset
|
119 --- a/a |
7307d2e98b32
fix qrefresh'ing an empty patch
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4090
diff
changeset
|
120 +++ b/a |
5863
3d1f9dcecdea
diff: don't show function name by default
Matt Mackall <mpm@selenic.com>
parents:
5764
diff
changeset
|
121 @@ -1,1 +1,2 @@ |
4173
7307d2e98b32
fix qrefresh'ing an empty patch
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4090
diff
changeset
|
122 a |
7307d2e98b32
fix qrefresh'ing an empty patch
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4090
diff
changeset
|
123 +a |
2729 | 124 % qpop |
125 Patch queue now empty | |
126 % qpush | |
127 applying test.patch | |
128 Now at: test.patch | |
129 % pop/push outside repo | |
130 Patch queue now empty | |
131 applying test.patch | |
132 Now at: test.patch | |
133 % qrefresh in subdir | |
134 % pop/push -a in subdir | |
135 Patch queue now empty | |
136 applying test.patch | |
137 applying test2.patch | |
138 Now at: test2.patch | |
139 % qseries | |
140 test.patch | |
141 test2.patch | |
3681
05d877dfd33d
fix qseries -v when there are unapplied patches
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3464
diff
changeset
|
142 Now at: test.patch |
05d877dfd33d
fix qseries -v when there are unapplied patches
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3464
diff
changeset
|
143 0 A test.patch: foo bar |
05d877dfd33d
fix qseries -v when there are unapplied patches
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3464
diff
changeset
|
144 1 U test2.patch: |
05d877dfd33d
fix qseries -v when there are unapplied patches
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3464
diff
changeset
|
145 applying test2.patch |
05d877dfd33d
fix qseries -v when there are unapplied patches
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3464
diff
changeset
|
146 Now at: test2.patch |
2729 | 147 % qapplied |
148 test.patch | |
149 test2.patch | |
150 % qtop | |
151 test2.patch | |
152 % qprev | |
153 test.patch | |
154 % qnext | |
155 All patches applied | |
156 % pop, qnext, qprev, qapplied | |
157 Now at: test.patch | |
158 test2.patch | |
159 Only one patch applied | |
160 test.patch | |
2846
b8d587cfa3bb
mq: test commit in repo with patches applied
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2828
diff
changeset
|
161 % commit should fail |
b8d587cfa3bb
mq: test commit in repo with patches applied
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2828
diff
changeset
|
162 abort: cannot commit over an applied mq patch |
2848
307439d6fede
mq: do not allow to push from repo with patches applied
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2846
diff
changeset
|
163 % push should fail |
307439d6fede
mq: do not allow to push from repo with patches applied
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2846
diff
changeset
|
164 pushing to ../../k |
307439d6fede
mq: do not allow to push from repo with patches applied
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2846
diff
changeset
|
165 abort: source has mq patches applied |
2729 | 166 % qunapplied |
167 test2.patch | |
3081
760414dc7ac6
Added tests for qpush/qpop with index.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
3027
diff
changeset
|
168 % qpush/qpop with index |
760414dc7ac6
Added tests for qpush/qpop with index.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
3027
diff
changeset
|
169 applying test2.patch |
760414dc7ac6
Added tests for qpush/qpop with index.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
3027
diff
changeset
|
170 Now at: test2.patch |
760414dc7ac6
Added tests for qpush/qpop with index.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
3027
diff
changeset
|
171 Now at: test.patch |
760414dc7ac6
Added tests for qpush/qpop with index.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
3027
diff
changeset
|
172 applying test1b.patch |
760414dc7ac6
Added tests for qpush/qpop with index.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
3027
diff
changeset
|
173 Now at: test1b.patch |
760414dc7ac6
Added tests for qpush/qpop with index.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
3027
diff
changeset
|
174 applying test2.patch |
760414dc7ac6
Added tests for qpush/qpop with index.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
3027
diff
changeset
|
175 Now at: test2.patch |
760414dc7ac6
Added tests for qpush/qpop with index.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
3027
diff
changeset
|
176 Now at: test1b.patch |
760414dc7ac6
Added tests for qpush/qpop with index.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
3027
diff
changeset
|
177 Now at: test.patch |
760414dc7ac6
Added tests for qpush/qpop with index.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
3027
diff
changeset
|
178 applying test1b.patch |
760414dc7ac6
Added tests for qpush/qpop with index.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
3027
diff
changeset
|
179 applying test2.patch |
760414dc7ac6
Added tests for qpush/qpop with index.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
3027
diff
changeset
|
180 Now at: test2.patch |
2852 | 181 % push should succeed |
182 Patch queue now empty | |
183 pushing to ../../k | |
184 searching for changes | |
185 adding changesets | |
186 adding manifests | |
187 adding file changes | |
188 added 1 changesets with 1 changes to 1 files | |
4101
e2ed92f4c0f7
add some tests for qpush/qpop error codes
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4096
diff
changeset
|
189 % qpush/qpop error codes |
e2ed92f4c0f7
add some tests for qpush/qpop error codes
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4096
diff
changeset
|
190 applying test.patch |
e2ed92f4c0f7
add some tests for qpush/qpop error codes
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4096
diff
changeset
|
191 applying test1b.patch |
e2ed92f4c0f7
add some tests for qpush/qpop error codes
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4096
diff
changeset
|
192 applying test2.patch |
e2ed92f4c0f7
add some tests for qpush/qpop error codes
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4096
diff
changeset
|
193 Now at: test2.patch |
e2ed92f4c0f7
add some tests for qpush/qpop error codes
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4096
diff
changeset
|
194 % pops all patches and succeeds |
e2ed92f4c0f7
add some tests for qpush/qpop error codes
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4096
diff
changeset
|
195 Patch queue now empty |
e2ed92f4c0f7
add some tests for qpush/qpop error codes
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4096
diff
changeset
|
196 qpop -a succeeds |
e2ed92f4c0f7
add some tests for qpush/qpop error codes
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4096
diff
changeset
|
197 % does nothing and succeeds |
e2ed92f4c0f7
add some tests for qpush/qpop error codes
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4096
diff
changeset
|
198 no patches applied |
e2ed92f4c0f7
add some tests for qpush/qpop error codes
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4096
diff
changeset
|
199 qpop -a succeeds |
e2ed92f4c0f7
add some tests for qpush/qpop error codes
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4096
diff
changeset
|
200 % fails - nothing else to pop |
e2ed92f4c0f7
add some tests for qpush/qpop error codes
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4096
diff
changeset
|
201 no patches applied |
e2ed92f4c0f7
add some tests for qpush/qpop error codes
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4096
diff
changeset
|
202 qpop fails |
e2ed92f4c0f7
add some tests for qpush/qpop error codes
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4096
diff
changeset
|
203 % pushes a patch and succeeds |
e2ed92f4c0f7
add some tests for qpush/qpop error codes
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4096
diff
changeset
|
204 applying test.patch |
e2ed92f4c0f7
add some tests for qpush/qpop error codes
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4096
diff
changeset
|
205 Now at: test.patch |
e2ed92f4c0f7
add some tests for qpush/qpop error codes
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4096
diff
changeset
|
206 qpush succeeds |
e2ed92f4c0f7
add some tests for qpush/qpop error codes
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4096
diff
changeset
|
207 % pops a patch and succeeds |
e2ed92f4c0f7
add some tests for qpush/qpop error codes
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4096
diff
changeset
|
208 Patch queue now empty |
e2ed92f4c0f7
add some tests for qpush/qpop error codes
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4096
diff
changeset
|
209 qpop succeeds |
e2ed92f4c0f7
add some tests for qpush/qpop error codes
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4096
diff
changeset
|
210 % pushes up to test1b.patch and succeeds |
e2ed92f4c0f7
add some tests for qpush/qpop error codes
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4096
diff
changeset
|
211 applying test.patch |
e2ed92f4c0f7
add some tests for qpush/qpop error codes
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4096
diff
changeset
|
212 applying test1b.patch |
e2ed92f4c0f7
add some tests for qpush/qpop error codes
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4096
diff
changeset
|
213 Now at: test1b.patch |
e2ed92f4c0f7
add some tests for qpush/qpop error codes
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4096
diff
changeset
|
214 qpush test1b.patch succeeds |
e2ed92f4c0f7
add some tests for qpush/qpop error codes
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4096
diff
changeset
|
215 % does nothing and succeeds |
e2ed92f4c0f7
add some tests for qpush/qpop error codes
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4096
diff
changeset
|
216 qpush: test1b.patch is already at the top |
e2ed92f4c0f7
add some tests for qpush/qpop error codes
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4096
diff
changeset
|
217 qpush test1b.patch succeeds |
e2ed92f4c0f7
add some tests for qpush/qpop error codes
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4096
diff
changeset
|
218 % does nothing and succeeds |
e2ed92f4c0f7
add some tests for qpush/qpop error codes
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4096
diff
changeset
|
219 qpop: test1b.patch is already at the top |
e2ed92f4c0f7
add some tests for qpush/qpop error codes
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4096
diff
changeset
|
220 qpop test1b.patch succeeds |
e2ed92f4c0f7
add some tests for qpush/qpop error codes
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4096
diff
changeset
|
221 % fails - can't push to this patch |
e2ed92f4c0f7
add some tests for qpush/qpop error codes
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4096
diff
changeset
|
222 abort: cannot push to a previous patch: test.patch |
e2ed92f4c0f7
add some tests for qpush/qpop error codes
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4096
diff
changeset
|
223 qpush test.patch fails |
e2ed92f4c0f7
add some tests for qpush/qpop error codes
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4096
diff
changeset
|
224 % fails - can't pop to this patch |
e2ed92f4c0f7
add some tests for qpush/qpop error codes
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4096
diff
changeset
|
225 abort: patch test2.patch is not applied |
e2ed92f4c0f7
add some tests for qpush/qpop error codes
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4096
diff
changeset
|
226 qpop test2.patch fails |
e2ed92f4c0f7
add some tests for qpush/qpop error codes
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4096
diff
changeset
|
227 % pops up to test.patch and succeeds |
e2ed92f4c0f7
add some tests for qpush/qpop error codes
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4096
diff
changeset
|
228 Now at: test.patch |
e2ed92f4c0f7
add some tests for qpush/qpop error codes
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4096
diff
changeset
|
229 qpop test.patch succeeds |
e2ed92f4c0f7
add some tests for qpush/qpop error codes
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4096
diff
changeset
|
230 % pushes all patches and succeeds |
e2ed92f4c0f7
add some tests for qpush/qpop error codes
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4096
diff
changeset
|
231 applying test1b.patch |
e2ed92f4c0f7
add some tests for qpush/qpop error codes
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4096
diff
changeset
|
232 applying test2.patch |
e2ed92f4c0f7
add some tests for qpush/qpop error codes
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4096
diff
changeset
|
233 Now at: test2.patch |
e2ed92f4c0f7
add some tests for qpush/qpop error codes
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4096
diff
changeset
|
234 qpush -a succeeds |
e2ed92f4c0f7
add some tests for qpush/qpop error codes
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4096
diff
changeset
|
235 % does nothing and succeeds |
e2ed92f4c0f7
add some tests for qpush/qpop error codes
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4096
diff
changeset
|
236 all patches are currently applied |
e2ed92f4c0f7
add some tests for qpush/qpop error codes
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4096
diff
changeset
|
237 qpush -a succeeds |
e2ed92f4c0f7
add some tests for qpush/qpop error codes
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4096
diff
changeset
|
238 % fails - nothing else to push |
e2ed92f4c0f7
add some tests for qpush/qpop error codes
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4096
diff
changeset
|
239 patch series already fully applied |
e2ed92f4c0f7
add some tests for qpush/qpop error codes
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4096
diff
changeset
|
240 qpush fails |
e2ed92f4c0f7
add some tests for qpush/qpop error codes
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4096
diff
changeset
|
241 % does nothing and succeeds |
e2ed92f4c0f7
add some tests for qpush/qpop error codes
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4096
diff
changeset
|
242 all patches are currently applied |
e2ed92f4c0f7
add some tests for qpush/qpop error codes
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4096
diff
changeset
|
243 qpush test2.patch succeeds |
2729 | 244 % strip |
245 adding x | |
246 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
247 saving bundle to | |
248 adding changesets | |
249 adding manifests | |
250 adding file changes | |
251 added 1 changesets with 1 changes to 1 files | |
252 (run 'hg update' to get a working copy) | |
3027
a4374f7331e4
Call patch.diff directly instead of printdiff - this also saves an
Brendan Cully <brendan@kublai.com>
parents:
2934
diff
changeset
|
253 % cd b; hg qrefresh |
a4374f7331e4
Call patch.diff directly instead of printdiff - this also saves an
Brendan Cully <brendan@kublai.com>
parents:
2934
diff
changeset
|
254 adding a |
a4374f7331e4
Call patch.diff directly instead of printdiff - this also saves an
Brendan Cully <brendan@kublai.com>
parents:
2934
diff
changeset
|
255 foo |
a4374f7331e4
Call patch.diff directly instead of printdiff - this also saves an
Brendan Cully <brendan@kublai.com>
parents:
2934
diff
changeset
|
256 |
a4374f7331e4
Call patch.diff directly instead of printdiff - this also saves an
Brendan Cully <brendan@kublai.com>
parents:
2934
diff
changeset
|
257 diff -r cb9a9f314b8b a |
a4374f7331e4
Call patch.diff directly instead of printdiff - this also saves an
Brendan Cully <brendan@kublai.com>
parents:
2934
diff
changeset
|
258 --- a/a |
a4374f7331e4
Call patch.diff directly instead of printdiff - this also saves an
Brendan Cully <brendan@kublai.com>
parents:
2934
diff
changeset
|
259 +++ b/a |
5863
3d1f9dcecdea
diff: don't show function name by default
Matt Mackall <mpm@selenic.com>
parents:
5764
diff
changeset
|
260 @@ -1,1 +1,2 @@ |
3027
a4374f7331e4
Call patch.diff directly instead of printdiff - this also saves an
Brendan Cully <brendan@kublai.com>
parents:
2934
diff
changeset
|
261 a |
a4374f7331e4
Call patch.diff directly instead of printdiff - this also saves an
Brendan Cully <brendan@kublai.com>
parents:
2934
diff
changeset
|
262 +a |
a4374f7331e4
Call patch.diff directly instead of printdiff - this also saves an
Brendan Cully <brendan@kublai.com>
parents:
2934
diff
changeset
|
263 diff -r cb9a9f314b8b b/f |
a4374f7331e4
Call patch.diff directly instead of printdiff - this also saves an
Brendan Cully <brendan@kublai.com>
parents:
2934
diff
changeset
|
264 --- /dev/null |
a4374f7331e4
Call patch.diff directly instead of printdiff - this also saves an
Brendan Cully <brendan@kublai.com>
parents:
2934
diff
changeset
|
265 +++ b/b/f |
a4374f7331e4
Call patch.diff directly instead of printdiff - this also saves an
Brendan Cully <brendan@kublai.com>
parents:
2934
diff
changeset
|
266 @@ -0,0 +1,1 @@ |
a4374f7331e4
Call patch.diff directly instead of printdiff - this also saves an
Brendan Cully <brendan@kublai.com>
parents:
2934
diff
changeset
|
267 +f |
a4374f7331e4
Call patch.diff directly instead of printdiff - this also saves an
Brendan Cully <brendan@kublai.com>
parents:
2934
diff
changeset
|
268 % hg qrefresh . |
a4374f7331e4
Call patch.diff directly instead of printdiff - this also saves an
Brendan Cully <brendan@kublai.com>
parents:
2934
diff
changeset
|
269 foo |
a4374f7331e4
Call patch.diff directly instead of printdiff - this also saves an
Brendan Cully <brendan@kublai.com>
parents:
2934
diff
changeset
|
270 |
a4374f7331e4
Call patch.diff directly instead of printdiff - this also saves an
Brendan Cully <brendan@kublai.com>
parents:
2934
diff
changeset
|
271 diff -r cb9a9f314b8b b/f |
a4374f7331e4
Call patch.diff directly instead of printdiff - this also saves an
Brendan Cully <brendan@kublai.com>
parents:
2934
diff
changeset
|
272 --- /dev/null |
a4374f7331e4
Call patch.diff directly instead of printdiff - this also saves an
Brendan Cully <brendan@kublai.com>
parents:
2934
diff
changeset
|
273 +++ b/b/f |
a4374f7331e4
Call patch.diff directly instead of printdiff - this also saves an
Brendan Cully <brendan@kublai.com>
parents:
2934
diff
changeset
|
274 @@ -0,0 +1,1 @@ |
a4374f7331e4
Call patch.diff directly instead of printdiff - this also saves an
Brendan Cully <brendan@kublai.com>
parents:
2934
diff
changeset
|
275 +f |
a4374f7331e4
Call patch.diff directly instead of printdiff - this also saves an
Brendan Cully <brendan@kublai.com>
parents:
2934
diff
changeset
|
276 M a |
3334
534806df5b5a
Test case for bdiff on buffer objects
Brendan Cully <brendan@kublai.com>
parents:
3081
diff
changeset
|
277 % qpush failure |
534806df5b5a
Test case for bdiff on buffer objects
Brendan Cully <brendan@kublai.com>
parents:
3081
diff
changeset
|
278 Patch queue now empty |
534806df5b5a
Test case for bdiff on buffer objects
Brendan Cully <brendan@kublai.com>
parents:
3081
diff
changeset
|
279 applying foo |
534806df5b5a
Test case for bdiff on buffer objects
Brendan Cully <brendan@kublai.com>
parents:
3081
diff
changeset
|
280 applying bar |
4901
27414950abf5
Update test output to reflect small changes in patch chattiness.
Bryan O'Sullivan <bos@serpentine.com>
parents:
4890
diff
changeset
|
281 file foo already exists |
27414950abf5
Update test output to reflect small changes in patch chattiness.
Bryan O'Sullivan <bos@serpentine.com>
parents:
4890
diff
changeset
|
282 1 out of 1 hunk FAILED -- saving rejects to file foo.rej |
3334
534806df5b5a
Test case for bdiff on buffer objects
Brendan Cully <brendan@kublai.com>
parents:
3081
diff
changeset
|
283 patch failed, unable to continue (try -v) |
534806df5b5a
Test case for bdiff on buffer objects
Brendan Cully <brendan@kublai.com>
parents:
3081
diff
changeset
|
284 patch failed, rejects left in working dir |
534806df5b5a
Test case for bdiff on buffer objects
Brendan Cully <brendan@kublai.com>
parents:
3081
diff
changeset
|
285 Errors during apply, please fix and refresh bar |
3464
ba3a96750de0
mq: test case for issue399
Brendan Cully <brendan@kublai.com>
parents:
3334
diff
changeset
|
286 ? foo |
ba3a96750de0
mq: test case for issue399
Brendan Cully <brendan@kublai.com>
parents:
3334
diff
changeset
|
287 ? foo.rej |
4219
6cb5be6bd70f
mq: add qparent tag (first parent of qbase)
Brendan Cully <brendan@kublai.com>
parents:
4182
diff
changeset
|
288 % mq tags |
6cb5be6bd70f
mq: add qparent tag (first parent of qbase)
Brendan Cully <brendan@kublai.com>
parents:
4182
diff
changeset
|
289 0 qparent |
6cb5be6bd70f
mq: add qparent tag (first parent of qbase)
Brendan Cully <brendan@kublai.com>
parents:
4182
diff
changeset
|
290 1 qbase foo |
6cb5be6bd70f
mq: add qparent tag (first parent of qbase)
Brendan Cully <brendan@kublai.com>
parents:
4182
diff
changeset
|
291 2 qtip bar tip |
5979
b4858eb4b58f
mqrepo: don't abort if the status file has an unknown node
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
5534
diff
changeset
|
292 % bad node in status |
b4858eb4b58f
mqrepo: don't abort if the status file has an unknown node
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
5534
diff
changeset
|
293 Now at: foo |
b4858eb4b58f
mqrepo: don't abort if the status file has an unknown node
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
5534
diff
changeset
|
294 changeset: 0:cb9a9f314b8b |
b4858eb4b58f
mqrepo: don't abort if the status file has an unknown node
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
5534
diff
changeset
|
295 mq status file refers to unknown node |
b4858eb4b58f
mqrepo: don't abort if the status file has an unknown node
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
5534
diff
changeset
|
296 tag: tip |
b4858eb4b58f
mqrepo: don't abort if the status file has an unknown node
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
5534
diff
changeset
|
297 user: test |
b4858eb4b58f
mqrepo: don't abort if the status file has an unknown node
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
5534
diff
changeset
|
298 date: Thu Jan 01 00:00:00 1970 +0000 |
b4858eb4b58f
mqrepo: don't abort if the status file has an unknown node
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
5534
diff
changeset
|
299 summary: a |
b4858eb4b58f
mqrepo: don't abort if the status file has an unknown node
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
5534
diff
changeset
|
300 |
b4858eb4b58f
mqrepo: don't abort if the status file has an unknown node
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
5534
diff
changeset
|
301 mq status file refers to unknown node |
b4858eb4b58f
mqrepo: don't abort if the status file has an unknown node
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
5534
diff
changeset
|
302 default 0:cb9a9f314b8b |
b4858eb4b58f
mqrepo: don't abort if the status file has an unknown node
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
5534
diff
changeset
|
303 abort: working directory revision is not qtip |
2934
2f190e998eb3
Teach mq about git patches
Brendan Cully <brendan@kublai.com>
parents:
2910
diff
changeset
|
304 new file |
2f190e998eb3
Teach mq about git patches
Brendan Cully <brendan@kublai.com>
parents:
2910
diff
changeset
|
305 |
2f190e998eb3
Teach mq about git patches
Brendan Cully <brendan@kublai.com>
parents:
2910
diff
changeset
|
306 diff --git a/new b/new |
2f190e998eb3
Teach mq about git patches
Brendan Cully <brendan@kublai.com>
parents:
2910
diff
changeset
|
307 new file mode 100755 |
2f190e998eb3
Teach mq about git patches
Brendan Cully <brendan@kublai.com>
parents:
2910
diff
changeset
|
308 --- /dev/null |
2f190e998eb3
Teach mq about git patches
Brendan Cully <brendan@kublai.com>
parents:
2910
diff
changeset
|
309 +++ b/new |
2f190e998eb3
Teach mq about git patches
Brendan Cully <brendan@kublai.com>
parents:
2910
diff
changeset
|
310 @@ -0,0 +1,1 @@ |
2f190e998eb3
Teach mq about git patches
Brendan Cully <brendan@kublai.com>
parents:
2910
diff
changeset
|
311 +foo |
2f190e998eb3
Teach mq about git patches
Brendan Cully <brendan@kublai.com>
parents:
2910
diff
changeset
|
312 copy file |
2f190e998eb3
Teach mq about git patches
Brendan Cully <brendan@kublai.com>
parents:
2910
diff
changeset
|
313 |
2f190e998eb3
Teach mq about git patches
Brendan Cully <brendan@kublai.com>
parents:
2910
diff
changeset
|
314 diff --git a/new b/copy |
2f190e998eb3
Teach mq about git patches
Brendan Cully <brendan@kublai.com>
parents:
2910
diff
changeset
|
315 copy from new |
2f190e998eb3
Teach mq about git patches
Brendan Cully <brendan@kublai.com>
parents:
2910
diff
changeset
|
316 copy to copy |
2f190e998eb3
Teach mq about git patches
Brendan Cully <brendan@kublai.com>
parents:
2910
diff
changeset
|
317 Now at: new |
2f190e998eb3
Teach mq about git patches
Brendan Cully <brendan@kublai.com>
parents:
2910
diff
changeset
|
318 applying copy |
2f190e998eb3
Teach mq about git patches
Brendan Cully <brendan@kublai.com>
parents:
2910
diff
changeset
|
319 Now at: copy |
2f190e998eb3
Teach mq about git patches
Brendan Cully <brendan@kublai.com>
parents:
2910
diff
changeset
|
320 diff --git a/new b/copy |
2f190e998eb3
Teach mq about git patches
Brendan Cully <brendan@kublai.com>
parents:
2910
diff
changeset
|
321 copy from new |
2f190e998eb3
Teach mq about git patches
Brendan Cully <brendan@kublai.com>
parents:
2910
diff
changeset
|
322 copy to copy |
3697
da262f35fbc8
add --git option to qdiff
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3681
diff
changeset
|
323 diff --git a/new b/copy |
da262f35fbc8
add --git option to qdiff
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3681
diff
changeset
|
324 copy from new |
da262f35fbc8
add --git option to qdiff
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3681
diff
changeset
|
325 copy to copy |
3699
4bafcf7aeb32
qrefresh: fix handling of added files (including copies) in the slow path
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3697
diff
changeset
|
326 1 files updated, 0 files merged, 2 files removed, 0 files unresolved |
6336
4b0c9c674707
warn about new heads on commit (issue842)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6280
diff
changeset
|
327 created new head |
3699
4bafcf7aeb32
qrefresh: fix handling of added files (including copies) in the slow path
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3697
diff
changeset
|
328 2 files updated, 0 files merged, 1 files removed, 0 files unresolved |
4bafcf7aeb32
qrefresh: fix handling of added files (including copies) in the slow path
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3697
diff
changeset
|
329 adding branch |
4bafcf7aeb32
qrefresh: fix handling of added files (including copies) in the slow path
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3697
diff
changeset
|
330 adding changesets |
4bafcf7aeb32
qrefresh: fix handling of added files (including copies) in the slow path
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3697
diff
changeset
|
331 adding manifests |
4bafcf7aeb32
qrefresh: fix handling of added files (including copies) in the slow path
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3697
diff
changeset
|
332 adding file changes |
4bafcf7aeb32
qrefresh: fix handling of added files (including copies) in the slow path
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3697
diff
changeset
|
333 added 1 changesets with 1 changes to 1 files |
4bafcf7aeb32
qrefresh: fix handling of added files (including copies) in the slow path
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3697
diff
changeset
|
334 Patch queue now empty |
6340
949e607ac544
mq: warn when applying a patch to somewhere other than tip
Matt Mackall <mpm@selenic.com>
parents:
6338
diff
changeset
|
335 (working directory not at tip) |
3699
4bafcf7aeb32
qrefresh: fix handling of added files (including copies) in the slow path
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3697
diff
changeset
|
336 applying bar |
4bafcf7aeb32
qrefresh: fix handling of added files (including copies) in the slow path
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3697
diff
changeset
|
337 Now at: bar |
4bafcf7aeb32
qrefresh: fix handling of added files (including copies) in the slow path
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3697
diff
changeset
|
338 diff --git a/bar b/bar |
4bafcf7aeb32
qrefresh: fix handling of added files (including copies) in the slow path
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3697
diff
changeset
|
339 new file mode 100644 |
4bafcf7aeb32
qrefresh: fix handling of added files (including copies) in the slow path
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3697
diff
changeset
|
340 --- /dev/null |
4bafcf7aeb32
qrefresh: fix handling of added files (including copies) in the slow path
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3697
diff
changeset
|
341 +++ b/bar |
4bafcf7aeb32
qrefresh: fix handling of added files (including copies) in the slow path
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3697
diff
changeset
|
342 @@ -0,0 +1,1 @@ |
4bafcf7aeb32
qrefresh: fix handling of added files (including copies) in the slow path
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3697
diff
changeset
|
343 +bar |
4bafcf7aeb32
qrefresh: fix handling of added files (including copies) in the slow path
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3697
diff
changeset
|
344 diff --git a/foo b/baz |
4bafcf7aeb32
qrefresh: fix handling of added files (including copies) in the slow path
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3697
diff
changeset
|
345 rename from foo |
4bafcf7aeb32
qrefresh: fix handling of added files (including copies) in the slow path
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3697
diff
changeset
|
346 rename to baz |
4bafcf7aeb32
qrefresh: fix handling of added files (including copies) in the slow path
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3697
diff
changeset
|
347 2 baz (foo) |
3700
4c158de5f245
qrefresh: fix handling of copies in the fast path
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3699
diff
changeset
|
348 diff --git a/bar b/bar |
4c158de5f245
qrefresh: fix handling of copies in the fast path
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3699
diff
changeset
|
349 new file mode 100644 |
4c158de5f245
qrefresh: fix handling of copies in the fast path
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3699
diff
changeset
|
350 --- /dev/null |
4c158de5f245
qrefresh: fix handling of copies in the fast path
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3699
diff
changeset
|
351 +++ b/bar |
4c158de5f245
qrefresh: fix handling of copies in the fast path
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3699
diff
changeset
|
352 @@ -0,0 +1,1 @@ |
4c158de5f245
qrefresh: fix handling of copies in the fast path
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3699
diff
changeset
|
353 +bar |
4c158de5f245
qrefresh: fix handling of copies in the fast path
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3699
diff
changeset
|
354 diff --git a/foo b/baz |
4c158de5f245
qrefresh: fix handling of copies in the fast path
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3699
diff
changeset
|
355 rename from foo |
4c158de5f245
qrefresh: fix handling of copies in the fast path
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3699
diff
changeset
|
356 rename to baz |
4c158de5f245
qrefresh: fix handling of copies in the fast path
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3699
diff
changeset
|
357 2 baz (foo) |
4890
bbdcacf7cef8
mq: autodetect an existing git patch during qrefresh (issue 491)
Bryan O'Sullivan <bos@serpentine.com>
parents:
4862
diff
changeset
|
358 diff --git a/bar b/bar |
bbdcacf7cef8
mq: autodetect an existing git patch during qrefresh (issue 491)
Bryan O'Sullivan <bos@serpentine.com>
parents:
4862
diff
changeset
|
359 diff --git a/foo b/baz |
3699
4bafcf7aeb32
qrefresh: fix handling of added files (including copies) in the slow path
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3697
diff
changeset
|
360 |
4bafcf7aeb32
qrefresh: fix handling of added files (including copies) in the slow path
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3697
diff
changeset
|
361 1 files updated, 0 files merged, 2 files removed, 0 files unresolved |
4bafcf7aeb32
qrefresh: fix handling of added files (including copies) in the slow path
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3697
diff
changeset
|
362 2 files updated, 0 files merged, 1 files removed, 0 files unresolved |
4bafcf7aeb32
qrefresh: fix handling of added files (including copies) in the slow path
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3697
diff
changeset
|
363 adding branch |
4bafcf7aeb32
qrefresh: fix handling of added files (including copies) in the slow path
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3697
diff
changeset
|
364 adding changesets |
4bafcf7aeb32
qrefresh: fix handling of added files (including copies) in the slow path
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3697
diff
changeset
|
365 adding manifests |
4bafcf7aeb32
qrefresh: fix handling of added files (including copies) in the slow path
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3697
diff
changeset
|
366 adding file changes |
4bafcf7aeb32
qrefresh: fix handling of added files (including copies) in the slow path
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3697
diff
changeset
|
367 added 1 changesets with 1 changes to 1 files |
4bafcf7aeb32
qrefresh: fix handling of added files (including copies) in the slow path
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3697
diff
changeset
|
368 Patch queue now empty |
6340
949e607ac544
mq: warn when applying a patch to somewhere other than tip
Matt Mackall <mpm@selenic.com>
parents:
6338
diff
changeset
|
369 (working directory not at tip) |
3699
4bafcf7aeb32
qrefresh: fix handling of added files (including copies) in the slow path
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3697
diff
changeset
|
370 applying bar |
4bafcf7aeb32
qrefresh: fix handling of added files (including copies) in the slow path
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3697
diff
changeset
|
371 Now at: bar |
4bafcf7aeb32
qrefresh: fix handling of added files (including copies) in the slow path
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3697
diff
changeset
|
372 diff --git a/foo b/bleh |
4bafcf7aeb32
qrefresh: fix handling of added files (including copies) in the slow path
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3697
diff
changeset
|
373 rename from foo |
4bafcf7aeb32
qrefresh: fix handling of added files (including copies) in the slow path
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3697
diff
changeset
|
374 rename to bleh |
4bafcf7aeb32
qrefresh: fix handling of added files (including copies) in the slow path
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3697
diff
changeset
|
375 diff --git a/quux b/quux |
4bafcf7aeb32
qrefresh: fix handling of added files (including copies) in the slow path
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3697
diff
changeset
|
376 new file mode 100644 |
4bafcf7aeb32
qrefresh: fix handling of added files (including copies) in the slow path
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3697
diff
changeset
|
377 --- /dev/null |
4bafcf7aeb32
qrefresh: fix handling of added files (including copies) in the slow path
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3697
diff
changeset
|
378 +++ b/quux |
4bafcf7aeb32
qrefresh: fix handling of added files (including copies) in the slow path
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3697
diff
changeset
|
379 @@ -0,0 +1,1 @@ |
4bafcf7aeb32
qrefresh: fix handling of added files (including copies) in the slow path
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3697
diff
changeset
|
380 +bar |
4bafcf7aeb32
qrefresh: fix handling of added files (including copies) in the slow path
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3697
diff
changeset
|
381 3 bleh (foo) |
3700
4c158de5f245
qrefresh: fix handling of copies in the fast path
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3699
diff
changeset
|
382 diff --git a/foo b/barney |
4c158de5f245
qrefresh: fix handling of copies in the fast path
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3699
diff
changeset
|
383 rename from foo |
4c158de5f245
qrefresh: fix handling of copies in the fast path
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3699
diff
changeset
|
384 rename to barney |
4c158de5f245
qrefresh: fix handling of copies in the fast path
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3699
diff
changeset
|
385 diff --git a/fred b/fred |
4c158de5f245
qrefresh: fix handling of copies in the fast path
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3699
diff
changeset
|
386 new file mode 100644 |
4c158de5f245
qrefresh: fix handling of copies in the fast path
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3699
diff
changeset
|
387 --- /dev/null |
4c158de5f245
qrefresh: fix handling of copies in the fast path
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3699
diff
changeset
|
388 +++ b/fred |
4c158de5f245
qrefresh: fix handling of copies in the fast path
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3699
diff
changeset
|
389 @@ -0,0 +1,1 @@ |
4c158de5f245
qrefresh: fix handling of copies in the fast path
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3699
diff
changeset
|
390 +bar |
4c158de5f245
qrefresh: fix handling of copies in the fast path
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3699
diff
changeset
|
391 3 barney (foo) |
5294
e14118f92730
mq: fix regression in 6fd953d5faea
Brendan Cully <brendan@kublai.com>
parents:
5148
diff
changeset
|
392 % refresh omitting an added file |
e14118f92730
mq: fix regression in 6fd953d5faea
Brendan Cully <brendan@kublai.com>
parents:
5148
diff
changeset
|
393 C newfile |
e14118f92730
mq: fix regression in 6fd953d5faea
Brendan Cully <brendan@kublai.com>
parents:
5148
diff
changeset
|
394 A newfile |
e14118f92730
mq: fix regression in 6fd953d5faea
Brendan Cully <brendan@kublai.com>
parents:
5148
diff
changeset
|
395 Now at: bar |
5026 | 396 % create a git patch |
397 diff --git a/alexander b/alexander | |
398 % create a git binary patch | |
399 8ba2a2f3e77b55d03051ff9c24ad65e7 bucephalus | |
400 diff --git a/bucephalus b/bucephalus | |
401 % check binary patches can be popped and pushed | |
402 Now at: addalexander | |
403 applying addbucephalus | |
404 Now at: addbucephalus | |
405 8ba2a2f3e77b55d03051ff9c24ad65e7 bucephalus | |
4065
8ee983e3d461
fix strip'ping the second parent of a merge
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3700
diff
changeset
|
406 % strip again |
8ee983e3d461
fix strip'ping the second parent of a merge
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3700
diff
changeset
|
407 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
6336
4b0c9c674707
warn about new heads on commit (issue842)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6280
diff
changeset
|
408 created new head |
4065
8ee983e3d461
fix strip'ping the second parent of a merge
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3700
diff
changeset
|
409 merging foo |
8ee983e3d461
fix strip'ping the second parent of a merge
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3700
diff
changeset
|
410 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
8ee983e3d461
fix strip'ping the second parent of a merge
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3700
diff
changeset
|
411 (branch merge, don't forget to commit) |
8ee983e3d461
fix strip'ping the second parent of a merge
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3700
diff
changeset
|
412 changeset: 3:99615015637b |
8ee983e3d461
fix strip'ping the second parent of a merge
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3700
diff
changeset
|
413 tag: tip |
8ee983e3d461
fix strip'ping the second parent of a merge
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3700
diff
changeset
|
414 parent: 2:20cbbe65cff7 |
8ee983e3d461
fix strip'ping the second parent of a merge
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3700
diff
changeset
|
415 parent: 1:d2871fc282d4 |
8ee983e3d461
fix strip'ping the second parent of a merge
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3700
diff
changeset
|
416 user: test |
8ee983e3d461
fix strip'ping the second parent of a merge
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3700
diff
changeset
|
417 date: Thu Jan 01 00:00:00 1970 +0000 |
8ee983e3d461
fix strip'ping the second parent of a merge
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3700
diff
changeset
|
418 summary: merge |
8ee983e3d461
fix strip'ping the second parent of a merge
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3700
diff
changeset
|
419 |
8ee983e3d461
fix strip'ping the second parent of a merge
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3700
diff
changeset
|
420 changeset: 2:20cbbe65cff7 |
8ee983e3d461
fix strip'ping the second parent of a merge
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3700
diff
changeset
|
421 parent: 0:53245c60e682 |
8ee983e3d461
fix strip'ping the second parent of a merge
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3700
diff
changeset
|
422 user: test |
8ee983e3d461
fix strip'ping the second parent of a merge
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3700
diff
changeset
|
423 date: Thu Jan 01 00:00:00 1970 +0000 |
8ee983e3d461
fix strip'ping the second parent of a merge
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3700
diff
changeset
|
424 summary: change foo 2 |
8ee983e3d461
fix strip'ping the second parent of a merge
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3700
diff
changeset
|
425 |
8ee983e3d461
fix strip'ping the second parent of a merge
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3700
diff
changeset
|
426 changeset: 1:d2871fc282d4 |
8ee983e3d461
fix strip'ping the second parent of a merge
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3700
diff
changeset
|
427 user: test |
8ee983e3d461
fix strip'ping the second parent of a merge
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3700
diff
changeset
|
428 date: Thu Jan 01 00:00:00 1970 +0000 |
8ee983e3d461
fix strip'ping the second parent of a merge
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3700
diff
changeset
|
429 summary: change foo 1 |
8ee983e3d461
fix strip'ping the second parent of a merge
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3700
diff
changeset
|
430 |
8ee983e3d461
fix strip'ping the second parent of a merge
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3700
diff
changeset
|
431 changeset: 0:53245c60e682 |
8ee983e3d461
fix strip'ping the second parent of a merge
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3700
diff
changeset
|
432 user: test |
8ee983e3d461
fix strip'ping the second parent of a merge
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3700
diff
changeset
|
433 date: Thu Jan 01 00:00:00 1970 +0000 |
8ee983e3d461
fix strip'ping the second parent of a merge
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3700
diff
changeset
|
434 summary: add foo |
8ee983e3d461
fix strip'ping the second parent of a merge
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3700
diff
changeset
|
435 |
8ee983e3d461
fix strip'ping the second parent of a merge
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3700
diff
changeset
|
436 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
8ee983e3d461
fix strip'ping the second parent of a merge
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3700
diff
changeset
|
437 saving bundle to |
8ee983e3d461
fix strip'ping the second parent of a merge
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3700
diff
changeset
|
438 saving bundle to |
8ee983e3d461
fix strip'ping the second parent of a merge
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3700
diff
changeset
|
439 adding branch |
8ee983e3d461
fix strip'ping the second parent of a merge
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3700
diff
changeset
|
440 adding changesets |
8ee983e3d461
fix strip'ping the second parent of a merge
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3700
diff
changeset
|
441 adding manifests |
8ee983e3d461
fix strip'ping the second parent of a merge
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3700
diff
changeset
|
442 adding file changes |
8ee983e3d461
fix strip'ping the second parent of a merge
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3700
diff
changeset
|
443 added 1 changesets with 1 changes to 1 files |
8ee983e3d461
fix strip'ping the second parent of a merge
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3700
diff
changeset
|
444 changeset: 1:20cbbe65cff7 |
8ee983e3d461
fix strip'ping the second parent of a merge
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3700
diff
changeset
|
445 tag: tip |
8ee983e3d461
fix strip'ping the second parent of a merge
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3700
diff
changeset
|
446 user: test |
8ee983e3d461
fix strip'ping the second parent of a merge
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3700
diff
changeset
|
447 date: Thu Jan 01 00:00:00 1970 +0000 |
8ee983e3d461
fix strip'ping the second parent of a merge
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3700
diff
changeset
|
448 summary: change foo 2 |
8ee983e3d461
fix strip'ping the second parent of a merge
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3700
diff
changeset
|
449 |
8ee983e3d461
fix strip'ping the second parent of a merge
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3700
diff
changeset
|
450 changeset: 0:53245c60e682 |
8ee983e3d461
fix strip'ping the second parent of a merge
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3700
diff
changeset
|
451 user: test |
8ee983e3d461
fix strip'ping the second parent of a merge
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3700
diff
changeset
|
452 date: Thu Jan 01 00:00:00 1970 +0000 |
8ee983e3d461
fix strip'ping the second parent of a merge
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3700
diff
changeset
|
453 summary: add foo |
8ee983e3d461
fix strip'ping the second parent of a merge
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3700
diff
changeset
|
454 |
4090
785ad8cd1d31
qclone: don't call reposetup manually
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4065
diff
changeset
|
455 % qclone |
4862
cba10652a901
mq: improve qclone error handling when patch directory is not a repository.
Brendan Cully <brendan@kublai.com>
parents:
4432
diff
changeset
|
456 abort: versioned patch repository not found (see qinit -c) |
cba10652a901
mq: improve qclone error handling when patch directory is not a repository.
Brendan Cully <brendan@kublai.com>
parents:
4432
diff
changeset
|
457 adding .hg/patches/patch1 |
4090
785ad8cd1d31
qclone: don't call reposetup manually
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4065
diff
changeset
|
458 main repo: |
785ad8cd1d31
qclone: don't call reposetup manually
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4065
diff
changeset
|
459 rev 1: change foo |
785ad8cd1d31
qclone: don't call reposetup manually
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4065
diff
changeset
|
460 rev 0: add foo |
785ad8cd1d31
qclone: don't call reposetup manually
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4065
diff
changeset
|
461 patch repo: |
785ad8cd1d31
qclone: don't call reposetup manually
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4065
diff
changeset
|
462 rev 0: checkpoint |
6338
0750f11152fe
clone: print "updating working directory" status message
Adrian Buehlmann <adrian@cadifra.com>
parents:
6336
diff
changeset
|
463 updating working directory |
4090
785ad8cd1d31
qclone: don't call reposetup manually
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4065
diff
changeset
|
464 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
785ad8cd1d31
qclone: don't call reposetup manually
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4065
diff
changeset
|
465 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
785ad8cd1d31
qclone: don't call reposetup manually
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4065
diff
changeset
|
466 main repo: |
785ad8cd1d31
qclone: don't call reposetup manually
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4065
diff
changeset
|
467 rev 0: add foo |
785ad8cd1d31
qclone: don't call reposetup manually
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4065
diff
changeset
|
468 patch repo: |
785ad8cd1d31
qclone: don't call reposetup manually
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4065
diff
changeset
|
469 rev 0: checkpoint |
785ad8cd1d31
qclone: don't call reposetup manually
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4065
diff
changeset
|
470 Patch queue now empty |
785ad8cd1d31
qclone: don't call reposetup manually
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4065
diff
changeset
|
471 main repo: |
785ad8cd1d31
qclone: don't call reposetup manually
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4065
diff
changeset
|
472 rev 0: add foo |
785ad8cd1d31
qclone: don't call reposetup manually
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4065
diff
changeset
|
473 patch repo: |
785ad8cd1d31
qclone: don't call reposetup manually
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4065
diff
changeset
|
474 rev 0: checkpoint |
6338
0750f11152fe
clone: print "updating working directory" status message
Adrian Buehlmann <adrian@cadifra.com>
parents:
6336
diff
changeset
|
475 updating working directory |
4090
785ad8cd1d31
qclone: don't call reposetup manually
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4065
diff
changeset
|
476 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
785ad8cd1d31
qclone: don't call reposetup manually
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4065
diff
changeset
|
477 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
785ad8cd1d31
qclone: don't call reposetup manually
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4065
diff
changeset
|
478 main repo: |
785ad8cd1d31
qclone: don't call reposetup manually
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4065
diff
changeset
|
479 rev 0: add foo |
785ad8cd1d31
qclone: don't call reposetup manually
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4065
diff
changeset
|
480 patch repo: |
785ad8cd1d31
qclone: don't call reposetup manually
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4065
diff
changeset
|
481 rev 0: checkpoint |
6280
9db24a36d182
patch: check filename is /dev/null for creation or deletion (issue 1033)
Patrick Mezard <pmezard@gmail.com>
parents:
6048
diff
changeset
|
482 % test applying on an empty file (issue 1033) |
9db24a36d182
patch: check filename is /dev/null for creation or deletion (issue 1033)
Patrick Mezard <pmezard@gmail.com>
parents:
6048
diff
changeset
|
483 adding a |
9db24a36d182
patch: check filename is /dev/null for creation or deletion (issue 1033)
Patrick Mezard <pmezard@gmail.com>
parents:
6048
diff
changeset
|
484 Patch queue now empty |
9db24a36d182
patch: check filename is /dev/null for creation or deletion (issue 1033)
Patrick Mezard <pmezard@gmail.com>
parents:
6048
diff
changeset
|
485 applying changea |
9db24a36d182
patch: check filename is /dev/null for creation or deletion (issue 1033)
Patrick Mezard <pmezard@gmail.com>
parents:
6048
diff
changeset
|
486 Now at: changea |