Show More
@@ -86,8 +86,7 b' final file versions in this repo:' | |||||
86 | bc3eca3f47023a3e70ca0d8cc95a22a6827db19d 644 quux |
|
86 | bc3eca3f47023a3e70ca0d8cc95a22a6827db19d 644 quux | |
87 | $ hg debugrename copied |
|
87 | $ hg debugrename copied | |
88 | copied renamed from foo:2ed2a3912a0b24502043eae84ee4b279c18b90dd |
|
88 | copied renamed from foo:2ed2a3912a0b24502043eae84ee4b279c18b90dd | |
89 | $ echo |
|
89 | ||
90 |
|
||||
91 | $ cd .. |
|
90 | $ cd .. | |
92 | $ splitrepo() |
|
91 | $ splitrepo() | |
93 | > { |
|
92 | > { |
@@ -198,8 +198,6 b' full conversion' | |||||
198 | 354ae8da6e890359ef49ade27b68bbc361f3ca88 644 baz |
|
198 | 354ae8da6e890359ef49ade27b68bbc361f3ca88 644 baz | |
199 | 9277c9cc8dd4576fc01a17939b4351e5ada93466 644 foo |
|
199 | 9277c9cc8dd4576fc01a17939b4351e5ada93466 644 foo | |
200 | 88dfeab657e8cf2cef3dec67b914f49791ae76b1 644 quux |
|
200 | 88dfeab657e8cf2cef3dec67b914f49791ae76b1 644 quux | |
201 | $ echo |
|
|||
202 |
|
||||
203 |
|
201 | |||
204 | test binary conversion (issue 1359) |
|
202 | test binary conversion (issue 1359) | |
205 |
|
203 | |||
@@ -226,8 +224,6 b' convert binary file' | |||||
226 | $ python -c 'print len(file("b", "rb").read())' |
|
224 | $ python -c 'print len(file("b", "rb").read())' | |
227 | 4096 |
|
225 | 4096 | |
228 | $ cd .. |
|
226 | $ cd .. | |
229 | $ echo |
|
|||
230 |
|
||||
231 |
|
227 | |||
232 | test author vs committer |
|
228 | test author vs committer | |
233 |
|
229 |
@@ -219,8 +219,9 b' Copy' | |||||
219 | newlink |
|
219 | newlink | |
220 |
|
220 | |||
221 | $ hg --cwd a rm b |
|
221 | $ hg --cwd a rm b | |
222 | $ echo % remove |
|
222 | ||
223 |
|
|
223 | Remove | |
|
224 | ||||
224 | $ hg --cwd a ci -d '4 0' -m 'remove a file' |
|
225 | $ hg --cwd a ci -d '4 0' -m 'remove a file' | |
225 | $ hg --cwd a tip -q |
|
226 | $ hg --cwd a tip -q | |
226 | 4:07b2e34a5b17 |
|
227 | 4:07b2e34a5b17 |
@@ -94,8 +94,7 b' record' | |||||
94 | a |
|
94 | a | |
95 | c |
|
95 | c | |
96 | \x1b[0;33mrecord this change to 'a'? [Ynsfdaq?]\x1b[0m (esc) |
|
96 | \x1b[0;33mrecord this change to 'a'? [Ynsfdaq?]\x1b[0m (esc) | |
97 | $ echo |
|
97 | ||
98 |
|
||||
99 | $ echo "[extensions]" >> $HGRCPATH |
|
98 | $ echo "[extensions]" >> $HGRCPATH | |
100 | $ echo "mq=" >> $HGRCPATH |
|
99 | $ echo "mq=" >> $HGRCPATH | |
101 | $ hg rollback |
|
100 | $ hg rollback | |
@@ -123,5 +122,3 b' qrecord' | |||||
123 | a |
|
122 | a | |
124 | c |
|
123 | c | |
125 | \x1b[0;33mrecord this change to 'a'? [Ynsfdaq?]\x1b[0m (esc) |
|
124 | \x1b[0;33mrecord this change to 'a'? [Ynsfdaq?]\x1b[0m (esc) | |
126 | $ echo |
|
|||
127 |
|
@@ -155,8 +155,6 b' test fetch with named branches' | |||||
155 | $ echo b > nbase/b |
|
155 | $ echo b > nbase/b | |
156 | $ hg -R nbase ci -Ad '3 0' -m b |
|
156 | $ hg -R nbase ci -Ad '3 0' -m b | |
157 | adding b |
|
157 | adding b | |
158 | $ echo |
|
|||
159 |
|
||||
160 |
|
158 | |||
161 | pull in change on foreign branch |
|
159 | pull in change on foreign branch | |
162 |
|
160 | |||
@@ -185,8 +183,6 b' parent should be 2 (no automatic update)' | |||||
185 | $ hg -R n2 parents --template '{rev}\n' |
|
183 | $ hg -R n2 parents --template '{rev}\n' | |
186 | 2 |
|
184 | 2 | |
187 | $ rm -fr n1 n2 |
|
185 | $ rm -fr n1 n2 | |
188 | $ echo |
|
|||
189 |
|
||||
190 |
|
186 | |||
191 | pull in changes on both foreign and local branches |
|
187 | pull in changes on both foreign and local branches | |
192 |
|
188 | |||
@@ -220,8 +216,6 b' parent should be 4 (fast forward)' | |||||
220 | $ hg -R n2 parents --template '{rev}\n' |
|
216 | $ hg -R n2 parents --template '{rev}\n' | |
221 | 4 |
|
217 | 4 | |
222 | $ rm -fr n1 n2 |
|
218 | $ rm -fr n1 n2 | |
223 | $ echo |
|
|||
224 |
|
||||
225 |
|
219 | |||
226 | pull changes on foreign (2 new heads) and local (1 new head) branches |
|
220 | pull changes on foreign (2 new heads) and local (1 new head) branches | |
227 | with a local change |
|
221 | with a local change | |
@@ -393,8 +387,6 b' test issue1726' | |||||
393 | new changeset 3:* merges remote changes with local (glob) |
|
387 | new changeset 3:* merges remote changes with local (glob) | |
394 | $ hg --cwd i1726r2 heads default --template '{rev}\n' |
|
388 | $ hg --cwd i1726r2 heads default --template '{rev}\n' | |
395 | 3 |
|
389 | 3 | |
396 | $ echo |
|
|||
397 |
|
||||
398 |
|
390 | |||
399 | test issue2047 |
|
391 | test issue2047 | |
400 |
|
392 |
@@ -520,8 +520,6 b' hgweb fileannotate, raw' | |||||
520 | $ echo "" >> b |
|
520 | $ echo "" >> b | |
521 | $ echo "" >> b |
|
521 | $ echo "" >> b | |
522 | $ diff -u b a |
|
522 | $ diff -u b a | |
523 | $ echo |
|
|||
524 |
|
||||
525 |
|
523 | |||
526 | hgweb filerevision, raw |
|
524 | hgweb filerevision, raw | |
527 |
|
525 | |||
@@ -531,8 +529,6 b' hgweb filerevision, raw' | |||||
531 | $ echo "" >> b |
|
529 | $ echo "" >> b | |
532 | $ hg cat primes.py >> b |
|
530 | $ hg cat primes.py >> b | |
533 | $ diff -u b a |
|
531 | $ diff -u b a | |
534 | $ echo |
|
|||
535 |
|
||||
536 |
|
532 | |||
537 | hgweb highlightcss friendly |
|
533 | hgweb highlightcss friendly | |
538 |
|
534 |
@@ -19,13 +19,11 b'' | |||||
19 | [hooks] |
|
19 | [hooks] | |
20 | pretxncommit.cr = python:hgext.win32text.forbidcr |
|
20 | pretxncommit.cr = python:hgext.win32text.forbidcr | |
21 | pretxnchangegroup.cr = python:hgext.win32text.forbidcr |
|
21 | pretxnchangegroup.cr = python:hgext.win32text.forbidcr | |
22 | $ echo |
|
22 | ||
23 |
|
||||
24 | $ echo hello > f |
|
23 | $ echo hello > f | |
25 | $ hg add f |
|
24 | $ hg add f | |
26 | $ hg ci -m 1 |
|
25 | $ hg ci -m 1 | |
27 | $ echo |
|
26 | ||
28 |
|
||||
29 | $ python unix2mac.py f |
|
27 | $ python unix2mac.py f | |
30 | $ hg ci -m 2 |
|
28 | $ hg ci -m 2 | |
31 | Attempt to commit or push text file(s) using CR line endings |
|
29 | Attempt to commit or push text file(s) using CR line endings |
@@ -31,8 +31,7 b' revision 3 - simple to merge' | |||||
31 | $ hg commit -Am "revision 3" |
|
31 | $ hg commit -Am "revision 3" | |
32 | created new head |
|
32 | created new head | |
33 | $ echo "[merge-tools]" > .hg/hgrc |
|
33 | $ echo "[merge-tools]" > .hg/hgrc | |
34 | $ echo |
|
34 | ||
35 |
|
||||
36 | $ beforemerge() { |
|
35 | $ beforemerge() { | |
37 | > cat .hg/hgrc |
|
36 | > cat .hg/hgrc | |
38 | > echo "# hg update -C 1" |
|
37 | > echo "# hg update -C 1" | |
@@ -44,7 +43,6 b' revision 3 - simple to merge' | |||||
44 | > echo "# hg stat" |
|
43 | > echo "# hg stat" | |
45 | > hg stat |
|
44 | > hg stat | |
46 | > rm -f f.orig |
|
45 | > rm -f f.orig | |
47 | > echo |
|
|||
48 | > } |
|
46 | > } | |
49 | $ domerge() { |
|
47 | $ domerge() { | |
50 | > beforemerge |
|
48 | > beforemerge | |
@@ -52,14 +50,9 b' revision 3 - simple to merge' | |||||
52 | > hg merge $* |
|
50 | > hg merge $* | |
53 | > aftermerge |
|
51 | > aftermerge | |
54 | > } |
|
52 | > } | |
55 | $ echo |
|
|||
56 |
|
||||
57 |
|
53 | |||
58 | Tool selection |
|
54 | Tool selection | |
59 |
|
55 | |||
60 | $ echo |
|
|||
61 |
|
||||
62 |
|
||||
63 | default is internal merge: |
|
56 | default is internal merge: | |
64 |
|
57 | |||
65 | $ beforemerge |
|
58 | $ beforemerge | |
@@ -88,7 +81,6 b' running from a devel copy, not a temp in' | |||||
88 | # hg stat |
|
81 | # hg stat | |
89 | M f |
|
82 | M f | |
90 | ? f.orig |
|
83 | ? f.orig | |
91 |
|
||||
92 |
|
84 | |||
93 | simplest hgrc using false for merge: |
|
85 | simplest hgrc using false for merge: | |
94 |
|
86 | |||
@@ -108,7 +100,6 b' simplest hgrc using false for merge:' | |||||
108 | # hg stat |
|
100 | # hg stat | |
109 | M f |
|
101 | M f | |
110 | ? f.orig |
|
102 | ? f.orig | |
111 |
|
||||
112 |
|
103 | |||
113 | true with higher .priority gets precedence: |
|
104 | true with higher .priority gets precedence: | |
114 |
|
105 | |||
@@ -127,7 +118,6 b' true with higher .priority gets preceden' | |||||
127 | space |
|
118 | space | |
128 | # hg stat |
|
119 | # hg stat | |
129 | M f |
|
120 | M f | |
130 |
|
||||
131 |
|
121 | |||
132 | unless lowered on command line: |
|
122 | unless lowered on command line: | |
133 |
|
123 | |||
@@ -147,7 +137,6 b' unless lowered on command line:' | |||||
147 | # hg stat |
|
137 | # hg stat | |
148 | M f |
|
138 | M f | |
149 | ? f.orig |
|
139 | ? f.orig | |
150 |
|
||||
151 |
|
140 | |||
152 | or false set higher on command line: |
|
141 | or false set higher on command line: | |
153 |
|
142 | |||
@@ -167,7 +156,6 b' or false set higher on command line:' | |||||
167 | # hg stat |
|
156 | # hg stat | |
168 | M f |
|
157 | M f | |
169 | ? f.orig |
|
158 | ? f.orig | |
170 |
|
||||
171 |
|
159 | |||
172 | or true.executable not found in PATH: |
|
160 | or true.executable not found in PATH: | |
173 |
|
161 | |||
@@ -187,7 +175,6 b' or true.executable not found in PATH:' | |||||
187 | # hg stat |
|
175 | # hg stat | |
188 | M f |
|
176 | M f | |
189 | ? f.orig |
|
177 | ? f.orig | |
190 |
|
||||
191 |
|
178 | |||
192 | or true.executable with bogus path: |
|
179 | or true.executable with bogus path: | |
193 |
|
180 | |||
@@ -207,7 +194,6 b' or true.executable with bogus path:' | |||||
207 | # hg stat |
|
194 | # hg stat | |
208 | M f |
|
195 | M f | |
209 | ? f.orig |
|
196 | ? f.orig | |
210 |
|
||||
211 |
|
197 | |||
212 | but true.executable set to cat found in PATH works: |
|
198 | but true.executable set to cat found in PATH works: | |
213 |
|
199 | |||
@@ -233,7 +219,6 b' but true.executable set to cat found in ' | |||||
233 | space |
|
219 | space | |
234 | # hg stat |
|
220 | # hg stat | |
235 | M f |
|
221 | M f | |
236 |
|
||||
237 |
|
222 | |||
238 | and true.executable set to cat with path works: |
|
223 | and true.executable set to cat with path works: | |
239 |
|
224 | |||
@@ -258,15 +243,9 b' and true.executable set to cat with path' | |||||
258 | space |
|
243 | space | |
259 | # hg stat |
|
244 | # hg stat | |
260 | M f |
|
245 | M f | |
261 |
|
||||
262 | $ echo |
|
|||
263 |
|
||||
264 |
|
246 | |||
265 | Tool selection and merge-patterns |
|
247 | Tool selection and merge-patterns | |
266 |
|
248 | |||
267 | $ echo |
|
|||
268 |
|
||||
269 |
|
||||
270 | merge-patterns specifies new tool false: |
|
249 | merge-patterns specifies new tool false: | |
271 |
|
250 | |||
272 | $ domerge -r 2 --config merge-patterns.f=false |
|
251 | $ domerge -r 2 --config merge-patterns.f=false | |
@@ -286,7 +265,6 b' merge-patterns specifies new tool false:' | |||||
286 | # hg stat |
|
265 | # hg stat | |
287 | M f |
|
266 | M f | |
288 | ? f.orig |
|
267 | ? f.orig | |
289 |
|
||||
290 |
|
268 | |||
291 | merge-patterns specifies executable not found in PATH and gets warning: |
|
269 | merge-patterns specifies executable not found in PATH and gets warning: | |
292 |
|
270 | |||
@@ -308,7 +286,6 b' merge-patterns specifies executable not ' | |||||
308 | # hg stat |
|
286 | # hg stat | |
309 | M f |
|
287 | M f | |
310 | ? f.orig |
|
288 | ? f.orig | |
311 |
|
||||
312 |
|
289 | |||
313 | merge-patterns specifies executable with bogus path and gets warning: |
|
290 | merge-patterns specifies executable with bogus path and gets warning: | |
314 |
|
291 | |||
@@ -330,15 +307,9 b' merge-patterns specifies executable with' | |||||
330 | # hg stat |
|
307 | # hg stat | |
331 | M f |
|
308 | M f | |
332 | ? f.orig |
|
309 | ? f.orig | |
333 |
|
||||
334 | $ echo |
|
|||
335 |
|
||||
336 |
|
310 | |||
337 | ui.merge overrules priority |
|
311 | ui.merge overrules priority | |
338 |
|
312 | |||
339 | $ echo |
|
|||
340 |
|
||||
341 |
|
||||
342 | ui.merge specifies false: |
|
313 | ui.merge specifies false: | |
343 |
|
314 | |||
344 | $ domerge -r 2 --config ui.merge=false |
|
315 | $ domerge -r 2 --config ui.merge=false | |
@@ -358,7 +329,6 b' ui.merge specifies false:' | |||||
358 | # hg stat |
|
329 | # hg stat | |
359 | M f |
|
330 | M f | |
360 | ? f.orig |
|
331 | ? f.orig | |
361 |
|
||||
362 |
|
332 | |||
363 | ui.merge specifies internal:fail: |
|
333 | ui.merge specifies internal:fail: | |
364 |
|
334 | |||
@@ -376,7 +346,6 b' ui.merge specifies internal:fail:' | |||||
376 | space |
|
346 | space | |
377 | # hg stat |
|
347 | # hg stat | |
378 | M f |
|
348 | M f | |
379 |
|
||||
380 |
|
349 | |||
381 | ui.merge specifies internal:local: |
|
350 | ui.merge specifies internal:local: | |
382 |
|
351 | |||
@@ -394,7 +363,6 b' ui.merge specifies internal:local:' | |||||
394 | space |
|
363 | space | |
395 | # hg stat |
|
364 | # hg stat | |
396 | M f |
|
365 | M f | |
397 |
|
||||
398 |
|
366 | |||
399 | ui.merge specifies internal:other: |
|
367 | ui.merge specifies internal:other: | |
400 |
|
368 | |||
@@ -412,7 +380,6 b' ui.merge specifies internal:other:' | |||||
412 | space |
|
380 | space | |
413 | # hg stat |
|
381 | # hg stat | |
414 | M f |
|
382 | M f | |
415 |
|
||||
416 |
|
383 | |||
417 | ui.merge specifies internal:prompt: |
|
384 | ui.merge specifies internal:prompt: | |
418 |
|
385 | |||
@@ -432,7 +399,6 b' ui.merge specifies internal:prompt:' | |||||
432 | space |
|
399 | space | |
433 | # hg stat |
|
400 | # hg stat | |
434 | M f |
|
401 | M f | |
435 |
|
||||
436 |
|
402 | |||
437 | ui.merge specifies internal:dump: |
|
403 | ui.merge specifies internal:dump: | |
438 |
|
404 | |||
@@ -455,7 +421,6 b' ui.merge specifies internal:dump:' | |||||
455 | ? f.local |
|
421 | ? f.local | |
456 | ? f.orig |
|
422 | ? f.orig | |
457 | ? f.other |
|
423 | ? f.other | |
458 |
|
||||
459 |
|
424 | |||
460 | f.base: |
|
425 | f.base: | |
461 |
|
426 | |||
@@ -475,8 +440,6 b' f.other:' | |||||
475 | revision 2 |
|
440 | revision 2 | |
476 | space |
|
441 | space | |
477 | $ rm f.base f.local f.other |
|
442 | $ rm f.base f.local f.other | |
478 | $ echo |
|
|||
479 |
|
||||
480 |
|
443 | |||
481 | ui.merge specifies internal:other but is overruled by pattern for false: |
|
444 | ui.merge specifies internal:other but is overruled by pattern for false: | |
482 |
|
445 | |||
@@ -497,15 +460,9 b' ui.merge specifies internal:other but is' | |||||
497 | # hg stat |
|
460 | # hg stat | |
498 | M f |
|
461 | M f | |
499 | ? f.orig |
|
462 | ? f.orig | |
500 |
|
||||
501 | $ echo |
|
|||
502 |
|
||||
503 |
|
463 | |||
504 | Premerge |
|
464 | Premerge | |
505 |
|
465 | |||
506 | $ echo |
|
|||
507 |
|
||||
508 |
|
||||
509 | ui.merge specifies internal:other but is overruled by --tool=false |
|
466 | ui.merge specifies internal:other but is overruled by --tool=false | |
510 |
|
467 | |||
511 | $ domerge -r 2 --config ui.merge=internal:other --tool=false |
|
468 | $ domerge -r 2 --config ui.merge=internal:other --tool=false | |
@@ -525,7 +482,7 b' ui.merge specifies internal:other but is' | |||||
525 | # hg stat |
|
482 | # hg stat | |
526 | M f |
|
483 | M f | |
527 | ? f.orig |
|
484 | ? f.orig | |
528 |
|
485 | |||
529 | HGMERGE specifies internal:other but is overruled by --tool=false |
|
486 | HGMERGE specifies internal:other but is overruled by --tool=false | |
530 |
|
487 | |||
531 | $ HGMERGE=internal:other ; export HGMERGE |
|
488 | $ HGMERGE=internal:other ; export HGMERGE | |
@@ -546,7 +503,7 b' HGMERGE specifies internal:other but is ' | |||||
546 | # hg stat |
|
503 | # hg stat | |
547 | M f |
|
504 | M f | |
548 | ? f.orig |
|
505 | ? f.orig | |
549 |
|
506 | |||
550 | $ unset HGMERGE # make sure HGMERGE doesn't interfere with remaining tests |
|
507 | $ unset HGMERGE # make sure HGMERGE doesn't interfere with remaining tests | |
551 |
|
508 | |||
552 | Default is silent simplemerge: |
|
509 | Default is silent simplemerge: | |
@@ -567,7 +524,6 b' Default is silent simplemerge:' | |||||
567 | revision 3 |
|
524 | revision 3 | |
568 | # hg stat |
|
525 | # hg stat | |
569 | M f |
|
526 | M f | |
570 |
|
||||
571 |
|
527 | |||
572 | .premerge=True is same: |
|
528 | .premerge=True is same: | |
573 |
|
529 | |||
@@ -587,7 +543,6 b' Default is silent simplemerge:' | |||||
587 | revision 3 |
|
543 | revision 3 | |
588 | # hg stat |
|
544 | # hg stat | |
589 | M f |
|
545 | M f | |
590 |
|
||||
591 |
|
546 | |||
592 | .premerge=False executes merge-tool: |
|
547 | .premerge=False executes merge-tool: | |
593 |
|
548 | |||
@@ -613,16 +568,11 b' Default is silent simplemerge:' | |||||
613 | space |
|
568 | space | |
614 | # hg stat |
|
569 | # hg stat | |
615 | M f |
|
570 | M f | |
616 |
|
||||
617 | $ echo |
|
|||
618 |
|
||||
619 |
|
571 | |||
620 | Tool execution |
|
572 | Tool execution | |
621 |
|
573 | |||
622 | $ echo |
|
574 | set tools.args explicit to include $base $local $other $output: | |
623 |
|
575 | |||
624 | $ echo '# set tools.args explicit to include $base $local $other $output:' # default '$local $base $other' |
|
|||
625 | # set tools.args explicit to include $base $local $other $output: |
|
|||
626 | $ beforemerge |
|
576 | $ beforemerge | |
627 | [merge-tools] |
|
577 | [merge-tools] | |
628 | false.whatever= |
|
578 | false.whatever= | |
@@ -655,9 +605,9 b' Tool execution' | |||||
655 | space |
|
605 | space | |
656 | # hg stat |
|
606 | # hg stat | |
657 | M f |
|
607 | M f | |
658 |
|
608 | |||
659 |
|
|
609 | Merge with "echo mergeresult > $local": | |
660 | # Merge with "echo mergeresult > $local": |
|
610 | ||
661 | $ beforemerge |
|
611 | $ beforemerge | |
662 | [merge-tools] |
|
612 | [merge-tools] | |
663 | false.whatever= |
|
613 | false.whatever= | |
@@ -673,9 +623,9 b' Tool execution' | |||||
673 | mergeresult |
|
623 | mergeresult | |
674 | # hg stat |
|
624 | # hg stat | |
675 | M f |
|
625 | M f | |
676 |
|
626 | |||
677 |
|
|
627 | - and $local is the file f: | |
678 | # - and $local is the file f: |
|
628 | ||
679 | $ beforemerge |
|
629 | $ beforemerge | |
680 | [merge-tools] |
|
630 | [merge-tools] | |
681 | false.whatever= |
|
631 | false.whatever= | |
@@ -691,9 +641,9 b' Tool execution' | |||||
691 |
|
|
641 | mergeresult | |
692 | # hg stat |
|
642 | # hg stat | |
693 |
|
|
643 | M f | |
694 |
|
644 | |||
695 |
|
|
645 | Merge with "echo mergeresult > $output" - the variable is a bit magic: | |
696 | # Merge with "echo mergeresult > $output" - the variable is a bit magic: |
|
646 | ||
697 | $ beforemerge |
|
647 | $ beforemerge | |
698 | [merge-tools] |
|
648 | [merge-tools] | |
699 |
|
|
649 | false.whatever= | |
@@ -709,7 +659,6 b' Tool execution' | |||||
709 | mergeresult |
|
659 | mergeresult | |
710 | # hg stat |
|
660 | # hg stat | |
711 | M f |
|
661 | M f | |
712 |
|
||||
713 |
|
662 | |||
714 | Merge using tool with a path that must be quoted: |
|
663 | Merge using tool with a path that must be quoted: | |
715 |
|
664 | |||
@@ -739,15 +688,9 b' Merge using tool with a path that must b' | |||||
739 | space |
|
688 | space | |
740 | # hg stat |
|
689 | # hg stat | |
741 | M f |
|
690 | M f | |
742 |
|
||||
743 | $ echo |
|
|||
744 |
|
||||
745 |
|
691 | |||
746 | Merge post-processing |
|
692 | Merge post-processing | |
747 |
|
693 | |||
748 | $ echo |
|
|||
749 |
|
||||
750 |
|
||||
751 | cat is a bad merge-tool and doesn't change: |
|
694 | cat is a bad merge-tool and doesn't change: | |
752 |
|
695 | |||
753 | $ domerge -y -r 2 --config merge-tools.true.checkchanged=1 |
|
696 | $ domerge -y -r 2 --config merge-tools.true.checkchanged=1 | |
@@ -775,4 +718,3 b" cat is a bad merge-tool and doesn't chan" | |||||
775 | # hg stat |
|
718 | # hg stat | |
776 | M f |
|
719 | M f | |
777 | ? f.orig |
|
720 | ? f.orig | |
778 |
|
@@ -110,8 +110,7 b' merge fails' | |||||
110 | $ hg merge 2 |
|
110 | $ hg merge 2 | |
111 | abort: outstanding uncommitted changes (use 'hg status' to list changes) |
|
111 | abort: outstanding uncommitted changes (use 'hg status' to list changes) | |
112 | [255] |
|
112 | [255] | |
113 |
|
|
113 | merge expected! | |
114 | %% merge expected! |
|
|||
115 | $ hg merge -f 2 |
|
114 | $ hg merge -f 2 | |
116 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
115 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
117 | (branch merge, don't forget to commit) |
|
116 | (branch merge, don't forget to commit) |
@@ -16,14 +16,10 b' imported patches in series file.' | |||||
16 | > a |
|
16 | > a | |
17 | > +b |
|
17 | > +b | |
18 | > EOF |
|
18 | > EOF | |
19 | $ echo |
|
|||
20 |
|
||||
21 |
|
19 | |||
22 | empty series |
|
20 | empty series | |
23 |
|
21 | |||
24 | $ hg qseries |
|
22 | $ hg qseries | |
25 | $ echo |
|
|||
26 |
|
||||
27 |
|
23 | |||
28 | qimport valid patch followed by invalid patch |
|
24 | qimport valid patch followed by invalid patch | |
29 |
|
25 | |||
@@ -31,8 +27,6 b' qimport valid patch followed by invalid ' | |||||
31 | adding b.patch to series file |
|
27 | adding b.patch to series file | |
32 | abort: unable to read file fakepatch |
|
28 | abort: unable to read file fakepatch | |
33 | [255] |
|
29 | [255] | |
34 | $ echo |
|
|||
35 |
|
||||
36 |
|
30 | |||
37 | valid patches before fail added to series |
|
31 | valid patches before fail added to series | |
38 |
|
32 |
@@ -135,8 +135,6 b' Add invalid tags:' | |||||
135 | $ echo >> .hgtags |
|
135 | $ echo >> .hgtags | |
136 | $ echo "foo bar" >> .hgtags |
|
136 | $ echo "foo bar" >> .hgtags | |
137 | $ echo "a5a5 invalid" >> .hg/localtags |
|
137 | $ echo "a5a5 invalid" >> .hg/localtags | |
138 | $ echo "committing .hgtags:" |
|
|||
139 | committing .hgtags: |
|
|||
140 | $ cat .hgtags |
|
138 | $ cat .hgtags | |
141 | acb14030fe0a21b60322c440ad2d20cf7685a376 first |
|
139 | acb14030fe0a21b60322c440ad2d20cf7685a376 first | |
142 | spam |
|
140 | spam |
@@ -16,16 +16,14 b'' | |||||
16 | [hooks] |
|
16 | [hooks] | |
17 | pretxncommit.crlf = python:hgext.win32text.forbidcrlf |
|
17 | pretxncommit.crlf = python:hgext.win32text.forbidcrlf | |
18 | pretxnchangegroup.crlf = python:hgext.win32text.forbidcrlf |
|
18 | pretxnchangegroup.crlf = python:hgext.win32text.forbidcrlf | |
19 | $ echo |
|
19 | ||
20 |
|
||||
21 | $ echo hello > f |
|
20 | $ echo hello > f | |
22 | $ hg add f |
|
21 | $ hg add f | |
23 |
|
22 | |||
24 | commit should succeed |
|
23 | commit should succeed | |
25 |
|
24 | |||
26 | $ hg ci -m 1 |
|
25 | $ hg ci -m 1 | |
27 | $ echo |
|
26 | ||
28 |
|
||||
29 | $ hg clone . ../zoz |
|
27 | $ hg clone . ../zoz | |
30 | updating to branch default |
|
28 | updating to branch default | |
31 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
29 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
@@ -41,8 +39,7 b' commit should fail' | |||||
41 | rollback completed |
|
39 | rollback completed | |
42 | abort: pretxncommit.crlf hook failed |
|
40 | abort: pretxncommit.crlf hook failed | |
43 | [255] |
|
41 | [255] | |
44 | $ echo |
|
42 | ||
45 |
|
||||
46 | $ mv .hg/hgrc .hg/hgrc.bak |
|
43 | $ mv .hg/hgrc .hg/hgrc.bak | |
47 |
|
44 | |||
48 | commits should succeed |
|
45 | commits should succeed | |
@@ -50,8 +47,6 b' commits should succeed' | |||||
50 | $ hg ci -m 2 |
|
47 | $ hg ci -m 2 | |
51 | $ hg cp f g |
|
48 | $ hg cp f g | |
52 | $ hg ci -m 2.2 |
|
49 | $ hg ci -m 2.2 | |
53 | $ echo |
|
|||
54 |
|
||||
55 |
|
50 | |||
56 | push should fail |
|
51 | push should fail | |
57 |
|
52 | |||
@@ -84,8 +79,7 b' push should fail' | |||||
84 | rollback completed |
|
79 | rollback completed | |
85 | abort: pretxnchangegroup.crlf hook failed |
|
80 | abort: pretxnchangegroup.crlf hook failed | |
86 | [255] |
|
81 | [255] | |
87 | $ echo |
|
82 | ||
88 |
|
||||
89 | $ mv .hg/hgrc.bak .hg/hgrc |
|
83 | $ mv .hg/hgrc.bak .hg/hgrc | |
90 | $ echo hello > f |
|
84 | $ echo hello > f | |
91 | $ hg rm g |
|
85 | $ hg rm g | |
@@ -93,8 +87,6 b' push should fail' | |||||
93 | commit should succeed |
|
87 | commit should succeed | |
94 |
|
88 | |||
95 | $ hg ci -m 2.3 |
|
89 | $ hg ci -m 2.3 | |
96 | $ echo |
|
|||
97 |
|
||||
98 |
|
90 | |||
99 | push should succeed |
|
91 | push should succeed | |
100 |
|
92 | |||
@@ -105,8 +97,6 b' push should succeed' | |||||
105 | adding manifests |
|
97 | adding manifests | |
106 | adding file changes |
|
98 | adding file changes | |
107 | added 3 changesets with 3 changes to 2 files |
|
99 | added 3 changesets with 3 changes to 2 files | |
108 | $ echo |
|
|||
109 |
|
||||
110 |
|
100 | |||
111 | and now for something completely different |
|
101 | and now for something completely different | |
112 |
|
102 | |||
@@ -124,12 +114,10 b' and now for something completely differe' | |||||
124 | $ hg revert -a |
|
114 | $ hg revert -a | |
125 | forgetting d/f2 |
|
115 | forgetting d/f2 | |
126 | $ rm d/f2 |
|
116 | $ rm d/f2 | |
127 | $ echo |
|
117 | ||
128 |
|
||||
129 | $ hg rem f |
|
118 | $ hg rem f | |
130 | $ hg ci -m 4 |
|
119 | $ hg ci -m 4 | |
131 | $ echo |
|
120 | ||
132 |
|
||||
133 | $ python -c 'file("bin", "wb").write("hello\x00\x0D\x0A")' |
|
121 | $ python -c 'file("bin", "wb").write("hello\x00\x0D\x0A")' | |
134 | $ hg add bin |
|
122 | $ hg add bin | |
135 | $ hg ci -m 5 |
|
123 | $ hg ci -m 5 | |
@@ -183,13 +171,10 b' and now for something completely differe' | |||||
183 | 1 |
|
171 | 1 | |
184 |
|
172 | |||
185 |
|
173 | |||
186 | $ echo |
|
|||
187 |
|
||||
188 | $ hg clone . dupe |
|
174 | $ hg clone . dupe | |
189 | updating to branch default |
|
175 | updating to branch default | |
190 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
176 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
191 | $ echo |
|
177 | ||
192 |
|
||||
193 | $ for x in a b c d; do echo content > dupe/$x; done |
|
178 | $ for x in a b c d; do echo content > dupe/$x; done | |
194 | $ hg -R dupe add |
|
179 | $ hg -R dupe add | |
195 | adding dupe/a |
|
180 | adding dupe/a | |
@@ -274,8 +259,6 b' and now for something completely differe' | |||||
274 | 1 |
|
259 | 1 | |
275 |
|
260 | |||
276 |
|
261 | |||
277 | $ echo |
|
|||
278 |
|
||||
279 | $ hg pull dupe |
|
262 | $ hg pull dupe | |
280 | pulling from dupe |
|
263 | pulling from dupe | |
281 | searching for changes |
|
264 | searching for changes | |
@@ -306,8 +289,7 b' and now for something completely differe' | |||||
306 | rollback completed |
|
289 | rollback completed | |
307 | abort: pretxnchangegroup.crlf hook failed |
|
290 | abort: pretxnchangegroup.crlf hook failed | |
308 | [255] |
|
291 | [255] | |
309 | $ echo |
|
292 | ||
310 |
|
||||
311 | $ hg log -v |
|
293 | $ hg log -v | |
312 | changeset: 5:f0b1c8d75fce |
|
294 | changeset: 5:f0b1c8d75fce | |
313 | tag: tip |
|
295 | tag: tip | |
@@ -358,8 +340,6 b' and now for something completely differe' | |||||
358 | 1 |
|
340 | 1 | |
359 |
|
341 | |||
360 |
|
342 | |||
361 | $ echo |
|
|||
362 |
|
||||
363 | $ rm .hg/hgrc |
|
343 | $ rm .hg/hgrc | |
364 | $ (echo some; echo text) > f3 |
|
344 | $ (echo some; echo text) > f3 | |
365 | $ python -c 'file("f4.bat", "wb").write("rem empty\x0D\x0A")' |
|
345 | $ python -c 'file("f4.bat", "wb").write("rem empty\x0D\x0A")' | |
@@ -372,8 +352,7 b' and now for something completely differe' | |||||
372 | text |
|
352 | text | |
373 | $ cat f4.bat |
|
353 | $ cat f4.bat | |
374 | rem empty\r (esc) |
|
354 | rem empty\r (esc) | |
375 | $ echo |
|
355 | ||
376 |
|
||||
377 | $ echo '[extensions]' >> .hg/hgrc |
|
356 | $ echo '[extensions]' >> .hg/hgrc | |
378 | $ echo 'win32text = ' >> .hg/hgrc |
|
357 | $ echo 'win32text = ' >> .hg/hgrc | |
379 | $ echo '[decode]' >> .hg/hgrc |
|
358 | $ echo '[decode]' >> .hg/hgrc | |
@@ -415,8 +394,7 b' Disable warning:' | |||||
415 | text\r (esc) |
|
394 | text\r (esc) | |
416 | $ cat f4.bat |
|
395 | $ cat f4.bat | |
417 | rem empty\r (esc) |
|
396 | rem empty\r (esc) | |
418 | $ echo |
|
397 | ||
419 |
|
||||
420 | $ python -c 'file("f5.sh", "wb").write("# empty\x0D\x0A")' |
|
398 | $ python -c 'file("f5.sh", "wb").write("# empty\x0D\x0A")' | |
421 | $ hg add f5.sh |
|
399 | $ hg add f5.sh | |
422 | $ hg ci -m 7 |
|
400 | $ hg ci -m 7 |
General Comments 0
You need to be logged in to leave comments.
Login now