Show More
@@ -1,4 +1,5 b'' | |||||
1 | a test for issue586 |
|
1 | Issue586: removing remote files after merge appears to corrupt the | |
|
2 | dirstate | |||
2 |
|
3 | |||
3 | $ hg init a |
|
4 | $ hg init a | |
4 | $ cd a |
|
5 | $ cd a | |
@@ -31,7 +32,8 b' a test for issue586' | |||||
31 | C b |
|
32 | C b | |
32 | $ cd .. |
|
33 | $ cd .. | |
33 |
|
34 | |||
34 | a test for issue 1433, related to issue586 |
|
35 | Issue1433: Traceback after two unrelated pull, two move, a merge and | |
|
36 | a commit (related to issue586) | |||
35 |
|
37 | |||
36 | create test repos |
|
38 | create test repos | |
37 |
|
39 |
@@ -69,7 +69,7 b' should fail' | |||||
69 | $ hg resolve -m a |
|
69 | $ hg resolve -m a | |
70 | $ hg ci -m merge |
|
70 | $ hg ci -m merge | |
71 |
|
71 | |||
72 | issue683 |
|
72 | Issue683: peculiarity with hg revert of an removed then added file | |
73 |
|
73 | |||
74 | $ hg forget a |
|
74 | $ hg forget a | |
75 | $ hg add a |
|
75 | $ hg add a |
@@ -69,7 +69,7 b' should all fail' | |||||
69 |
|
69 | |||
70 | $ cd .. |
|
70 | $ cd .. | |
71 |
|
71 | |||
72 | issue 1527 |
|
72 | Issue1527: repeated addremove causes util.Abort | |
73 |
|
73 | |||
74 |
$ |
|
74 | $ hg init rep3; cd rep3 | |
75 | $ mkdir d |
|
75 | $ mkdir d |
@@ -207,7 +207,7 b' linkrev vs rev with -l' | |||||
207 | 1:2: a |
|
207 | 1:2: a | |
208 | 1:3: a |
|
208 | 1:3: a | |
209 |
|
209 | |||
210 | test issue 589 |
|
210 | Issue589: "undelete" sequence leads to crash | |
211 |
|
211 | |||
212 | annotate was crashing when trying to --follow something |
|
212 | annotate was crashing when trying to --follow something | |
213 |
|
213 |
@@ -287,7 +287,8 b' skip' | |||||
287 | 5cd978ea5149 |
|
287 | 5cd978ea5149 | |
288 |
|
288 | |||
289 |
|
289 | |||
290 | reproduce AssertionError, issue1228 and issue1182 |
|
290 | Issue1228: hg bisect crashes when you skip the last rev in bisection | |
|
291 | Issue1182: hg bisect exception | |||
291 |
|
292 | |||
292 | $ hg bisect -r |
|
293 | $ hg bisect -r | |
293 | $ hg bisect -b 4 |
|
294 | $ hg bisect -b 4 |
@@ -232,7 +232,8 b' issue76 msg2163' | |||||
232 | $ hg -R test bundle --base 3 -r 3 -r 3 test-bundle-cset-3.hg |
|
232 | $ hg -R test bundle --base 3 -r 3 -r 3 test-bundle-cset-3.hg | |
233 | 1 changesets found |
|
233 | 1 changesets found | |
234 |
|
234 | |||
235 | issue1910 |
|
235 | Issue1910: 'hg bundle --base $head' does not exclude $head from | |
|
236 | result | |||
236 |
|
237 | |||
237 | $ hg -R test bundle --base 7 test-bundle-cset-7.hg |
|
238 | $ hg -R test bundle --base 7 test-bundle-cset-7.hg | |
238 | 4 changesets found |
|
239 | 4 changesets found |
@@ -126,7 +126,7 b' churn with space in alias' | |||||
126 | $ cd .. |
|
126 | $ cd .. | |
127 |
|
127 | |||
128 |
|
128 | |||
129 |
|
|
129 | Issue833: ZeroDivisionError | |
130 |
|
130 | |||
131 | $ hg init issue-833 |
|
131 | $ hg init issue-833 | |
132 | $ cd issue-833 |
|
132 | $ cd issue-833 |
@@ -418,7 +418,8 b" Branch 'stable' is checked out:" | |||||
418 | $ rm -r ua |
|
418 | $ rm -r ua | |
419 |
|
419 | |||
420 |
|
420 | |||
421 | Testing issue2267: |
|
421 | Issue2267: Error in 1.6 hg.py: TypeError: 'NoneType' object is not | |
|
422 | iterable in addbranchrevs() | |||
422 |
|
423 | |||
423 | $ cat <<EOF > simpleclone.py |
|
424 | $ cat <<EOF > simpleclone.py | |
424 | > from mercurial import ui, hg |
|
425 | > from mercurial import ui, hg |
@@ -548,7 +548,7 b' Issue338:' | |||||
548 | [1e4e1b8f71e0] |
|
548 | [1e4e1b8f71e0] | |
549 |
|
549 | |||
550 |
|
550 | |||
551 | Issue 2130: |
|
551 | Issue2130: xml output for 'hg heads' is malformed | |
552 |
|
552 | |||
553 | $ hg heads --style changelog |
|
553 | $ hg heads --style changelog | |
554 | 2020-01-01 test <test> |
|
554 | 2020-01-01 test <test> | |
@@ -1298,7 +1298,8 b' Merged tag overrides:' | |||||
1298 | $ cd .. |
|
1298 | $ cd .. | |
1299 |
|
1299 | |||
1300 |
|
1300 | |||
1301 | Style path expansion (issue1948): |
|
1301 | Style path expansion: issue1948 - ui.style option doesn't work on OSX | |
|
1302 | if it is a relative path | |||
1302 |
|
1303 | |||
1303 | $ mkdir -p home/styles |
|
1304 | $ mkdir -p home/styles | |
1304 |
|
1305 |
@@ -204,6 +204,8 b' subdir log' | |||||
204 | $ cd .. |
|
204 | $ cd .. | |
205 | $ cd .. |
|
205 | $ cd .. | |
206 |
|
206 | |||
|
207 | Issue1049: Hg permits partial commit of merge without warning | |||
|
208 | ||||
207 | $ cd .. |
|
209 | $ cd .. | |
208 | $ hg init issue1049 |
|
210 | $ hg init issue1049 | |
209 | $ cd issue1049 |
|
211 | $ cd issue1049 |
@@ -16,7 +16,8 b'' | |||||
16 | moving a/b/c/d/z to z/b/c/d/z |
|
16 | moving a/b/c/d/z to z/b/c/d/z | |
17 | $ cd .. |
|
17 | $ cd .. | |
18 |
|
18 | |||
19 | ------ issue1790 |
|
19 | Issue1790: dirstate entry locked into unset if file mtime is set into | |
|
20 | the future | |||
20 |
|
21 | |||
21 | Prepare test repo: |
|
22 | Prepare test repo: | |
22 |
|
23 |
@@ -232,7 +232,7 b" Check hgweb's load order:" | |||||
232 | [+] marked option can be specified multiple times |
|
232 | [+] marked option can be specified multiple times | |
233 | $ echo 'debugextension = !' >> $HGRCPATH |
|
233 | $ echo 'debugextension = !' >> $HGRCPATH | |
234 |
|
234 | |||
235 | Issue811: |
|
235 | Issue811: Problem loading extensions twice (by site and by user) | |
236 |
|
236 | |||
237 | $ debugpath=`pwd`/debugissue811.py |
|
237 | $ debugpath=`pwd`/debugissue811.py | |
238 | $ cat > debugissue811.py <<EOF |
|
238 | $ cat > debugissue811.py <<EOF |
@@ -1,4 +1,4 b'' | |||||
1 | test for issue351 |
|
1 | Issue351: mq: qrefresh can create extra revlog entry | |
2 |
|
2 | |||
3 | $ echo "[extensions]" >> $HGRCPATH |
|
3 | $ echo "[extensions]" >> $HGRCPATH | |
4 | $ echo "mq=" >> $HGRCPATH |
|
4 | $ echo "mq=" >> $HGRCPATH |
@@ -733,7 +733,7 b' File log with revs != cset revs:' | |||||
733 | summary: two |
|
733 | summary: two | |
734 |
|
734 | |||
735 |
|
735 | |||
736 |
File log with explicit style |
|
736 | Issue1896: File log with explicit style | |
737 |
$ |
|
737 | $ hg glog --style=default one | |
738 | o changeset: 0:3d578b4a1f53 |
|
738 | o changeset: 0:3d578b4a1f53 | |
739 | user: test |
|
739 | user: test |
@@ -116,9 +116,10 b' last character omitted in output to avoi' | |||||
116 |
|
116 | |||
117 | $ cd .. |
|
117 | $ cd .. | |
118 |
|
118 | |||
|
119 | Issue685: trackback in grep -r after rename | |||
|
120 | ||||
119 | Got a traceback when using grep on a single |
|
121 | Got a traceback when using grep on a single | |
120 | revision with renamed files. |
|
122 | revision with renamed files. | |
121 | issue 685 |
|
|||
122 |
|
123 | |||
123 |
$ |
|
124 | $ hg init issue685 | |
124 | $ cd issue685 |
|
125 | $ cd issue685 |
@@ -1,6 +1,6 b'' | |||||
1 | $ hg init |
|
1 | $ hg init | |
2 |
|
2 | |||
3 |
|
|
3 | Issue562: .hgignore requires newline at end: | |
4 |
|
4 | |||
5 | $ touch foo |
|
5 | $ touch foo | |
6 | $ touch bar |
|
6 | $ touch bar |
@@ -4,7 +4,7 b'' | |||||
4 | [255] |
|
4 | [255] | |
5 | $ echo "" > $HGRCPATH |
|
5 | $ echo "" > $HGRCPATH | |
6 |
|
6 | |||
7 | issue1199: escaping |
|
7 | Issue1199: Can't use '%' in hgrc (eg url encoded username) | |
8 |
|
8 | |||
9 | $ hg init "foo%bar" |
|
9 | $ hg init "foo%bar" | |
10 | $ hg clone "foo%bar" foobar |
|
10 | $ hg clone "foo%bar" foobar |
@@ -467,7 +467,9 b' make sure --traceback works on hook impo' | |||||
467 | ImportError: No module named hgext_importfail |
|
467 | ImportError: No module named hgext_importfail | |
468 | Traceback (most recent call last): |
|
468 | Traceback (most recent call last): | |
469 |
|
469 | |||
470 | commit and update hooks should run after command completion (issue 1827) |
|
470 | Issue1827: Hooks Update & Commit not completely post operation | |
|
471 | ||||
|
472 | commit and update hooks should run after command completion | |||
471 |
|
473 | |||
472 | $ echo '[hooks]' > .hg/hgrc |
|
474 | $ echo '[hooks]' > .hg/hgrc | |
473 | $ echo 'commit = hg id' >> .hg/hgrc |
|
475 | $ echo 'commit = hg id' >> .hg/hgrc |
@@ -344,9 +344,11 b' plain diff in email, [PATCH] subject, me' | |||||
344 | $ rm -r b |
|
344 | $ rm -r b | |
345 |
|
345 | |||
346 |
|
346 | |||
347 | We weren't backing up the correct dirstate file when importing many patches |
|
347 | Issue963: Parent of working dir incorrect after import of multiple | |
348 | (issue963) |
|
348 | patches and rollback | |
349 | import patch1 patch2; rollback |
|
349 | ||
|
350 | We weren't backing up the correct dirstate file when importing many | |||
|
351 | patches: import patch1 patch2; rollback | |||
350 |
|
352 | |||
351 | $ echo line 3 >> a/a |
|
353 | $ echo line 3 >> a/a | |
352 | $ hg --cwd a ci -m'third change' |
|
354 | $ hg --cwd a ci -m'third change' | |
@@ -542,7 +544,7 b' Test importing a patch ending with a bin' | |||||
542 | $ cd .. |
|
544 | $ cd .. | |
543 |
|
545 | |||
544 |
|
546 | |||
545 |
test update+rename with common name |
|
547 | Issue927: test update+rename with common name | |
546 |
|
548 | |||
547 |
|
|
549 | $ hg init t | |
548 | $ cd t |
|
550 | $ cd t | |
@@ -661,7 +663,7 b' test import with similarity and git and ' | |||||
661 | $ cd .. |
|
663 | $ cd .. | |
662 |
|
664 | |||
663 |
|
665 | |||
664 |
add empty file from the end of patch |
|
666 | Issue1495: add empty file from the end of patch | |
665 |
|
667 | |||
666 |
|
|
668 | $ hg init addemptyend | |
667 | $ cd addemptyend |
|
669 | $ cd addemptyend | |
@@ -716,7 +718,7 b' some people have patches like the follow' | |||||
716 | a |
|
718 | a | |
717 |
|
719 | |||
718 |
|
720 | |||
719 |
first line mistaken for email headers |
|
721 | Issue1859: first line mistaken for email headers | |
720 |
|
722 | |||
721 |
|
|
723 | $ hg init emailconfusion | |
722 | $ cd emailconfusion |
|
724 | $ cd emailconfusion | |
@@ -825,7 +827,7 b' first line mistaken for email headers (i' | |||||
825 | $ cd .. |
|
827 | $ cd .. | |
826 |
|
828 | |||
827 |
|
829 | |||
828 | issue2102 |
|
830 | Issue2102: hg export and hg import speak different languages | |
829 |
|
831 | |||
830 | $ hg init issue2102 |
|
832 | $ hg init issue2102 | |
831 | $ cd issue2102 |
|
833 | $ cd issue2102 |
@@ -83,7 +83,7 b'' | |||||
83 | t/e.h |
|
83 | t/e.h | |
84 | t/x |
|
84 | t/x | |
85 |
|
85 | |||
86 | Test issue294: |
|
86 | Issue294: hg remove --after dir fails when dir.* also exists | |
87 |
|
87 | |||
88 |
$ |
|
88 | $ cd .. | |
89 |
$ |
|
89 | $ rm -r t |
@@ -1020,7 +1020,7 b' log -p -R repo' | |||||
1020 | summary: add foo, related |
|
1020 | summary: add foo, related | |
1021 |
|
1021 | |||
1022 |
|
1022 | |||
1023 | Test from/for issue2383 |
|
1023 | Issue2383: hg log showing _less_ differences than hg diff | |
1024 |
|
1024 | |||
1025 | $ hg init issue2383 |
|
1025 | $ hg init issue2383 | |
1026 | $ cd issue2383 |
|
1026 | $ cd issue2383 |
@@ -1,4 +1,4 b'' | |||||
1 |
|
|
1 | Issue529: mq aborts when merging patch deleting files | |
2 |
|
|
2 | ||
3 | $ checkundo() |
|
3 | $ checkundo() | |
4 | > { |
|
4 | > { |
@@ -1,8 +1,7 b'' | |||||
1 |
|
1 | |||
2 | # Test issue835: |
|
2 | Issue835: qpush fails immediately when patching a missing file, but | |
3 | # qpush fails immediately when patching a missing file, but |
|
3 | remaining added files are still created empty which will trick a | |
4 | # remaining added files are still created empty which will |
|
4 | future qrefresh. | |
5 | # trick a future qrefresh. |
|
|||
6 |
|
|
5 | ||
7 |
$ |
|
6 | $ cat > writelines.py <<EOF | |
8 | > import sys |
|
7 | > import sys |
@@ -402,7 +402,7 b' Refresh and check changes again:' | |||||
402 | $ cd .. |
|
402 | $ cd .. | |
403 |
|
403 | |||
404 |
|
404 | |||
405 |
|
|
405 | Issue1441: qrefresh confused after hg rename: | |
406 |
|
406 | |||
407 | $ hg init repo-1441 |
|
407 | $ hg init repo-1441 | |
408 | $ cd repo-1441 |
|
408 | $ cd repo-1441 | |
@@ -422,7 +422,8 b' Test issue 1441: qrefresh confused after' | |||||
422 | $ cd .. |
|
422 | $ cd .. | |
423 |
|
423 | |||
424 |
|
424 | |||
425 |
Issue2025: qrefresh does not honor filtering options when tip != |
|
425 | Issue2025: qrefresh does not honor filtering options when tip != | |
|
426 | qtip: | |||
426 |
|
427 | |||
427 | $ hg init repo-2025 |
|
428 | $ hg init repo-2025 | |
428 | $ cd repo-2025 |
|
429 | $ cd repo-2025 |
@@ -1215,7 +1215,7 b' repo with patches unapplied' | |||||
1215 | $ cd .. |
|
1215 | $ cd .. | |
1216 |
|
1216 | |||
1217 |
|
1217 | |||
1218 |
test applying on an empty file |
|
1218 | Issue1033: test applying on an empty file | |
1219 |
|
1219 | |||
1220 | $ hg init empty |
|
1220 | $ hg init empty | |
1221 | $ cd empty |
|
1221 | $ cd empty |
@@ -51,7 +51,7 b'' | |||||
51 | $ hg rollback --dry-run --verbose |
|
51 | $ hg rollback --dry-run --verbose | |
52 | rolling back to revision -1 \(undo pull: http://foo:\*\*\*@localhost:.*/\) (re) |
|
52 | rolling back to revision -1 \(undo pull: http://foo:\*\*\*@localhost:.*/\) (re) | |
53 |
|
53 | |||
54 | Issue 622: |
|
54 | Issue622: hg init && hg pull -u URL doesn't checkout default branch | |
55 |
|
55 | |||
56 | $ cd .. |
|
56 | $ cd .. | |
57 | $ hg init empty |
|
57 | $ hg init empty |
@@ -141,7 +141,8 b'' | |||||
141 | [1] |
|
141 | [1] | |
142 |
|
142 | |||
143 |
|
143 | |||
144 | Issue 450: |
|
144 | Issue450: push -r warns about remote head creation even if no heads | |
|
145 | will be created | |||
145 |
|
146 | |||
146 |
$ |
|
147 | $ hg init ../e | |
147 | $ hg push -r 0 ../e |
|
148 | $ hg push -r 0 ../e | |
@@ -163,7 +164,8 b' Issue 450:' | |||||
163 | $ cd .. |
|
164 | $ cd .. | |
164 |
|
165 | |||
165 |
|
166 | |||
166 | Issue 736: |
|
167 | Issue736: named branches are not considered for detection of | |
|
168 | unmerged heads in "hg push" | |||
167 |
|
169 | |||
168 | $ hg init f |
|
170 | $ hg init f | |
169 | $ cd f |
|
171 | $ cd f |
@@ -1,5 +1,5 b'' | |||||
1 |
|
|
1 | Issue746: renaming files brought by the second parent of a merge was | |
2 |
|
|
2 | broken. | |
3 |
|
3 | |||
4 | Create source repository: |
|
4 | Create source repository: | |
5 |
|
5 | |||
@@ -59,8 +59,8 b' Rename back c as b:' | |||||
59 |
|
59 | |||
60 | $ cd .. |
|
60 | $ cd .. | |
61 |
|
61 | |||
62 |
|
|
62 | Issue 1476: renaming a first parent file into another first parent | |
63 |
|
|
63 | file while none of them belong to the second parent was broken | |
64 |
|
64 | |||
65 | $ hg init repo1476 |
|
65 | $ hg init repo1476 | |
66 | $ cd repo1476 |
|
66 | $ cd repo1476 |
@@ -168,7 +168,7 b' should print executable' | |||||
168 | $ cd .. |
|
168 | $ cd .. | |
169 |
|
169 | |||
170 |
|
170 | |||
171 | issue 241 |
|
171 | Issue241: update and revert produces inconsistent repositories | |
172 |
|
172 | |||
173 |
$ |
|
173 | $ hg init a | |
174 | $ cd a |
|
174 | $ cd a | |
@@ -194,7 +194,7 b' should succeed' | |||||
194 | reverting a |
|
194 | reverting a | |
195 |
|
195 | |||
196 |
|
196 | |||
197 | issue332 |
|
197 | Issue332: confusing message when reverting directory | |
198 |
|
198 | |||
199 | $ hg ci -A -m b |
|
199 | $ hg ci -A -m b | |
200 | adding b/b |
|
200 | adding b/b |
@@ -1,4 +1,4 b'' | |||||
1 | issue 1678 |
|
1 | Issue1678: IndexError when pushing | |
2 |
|
2 | |||
3 | setting up base repo |
|
3 | setting up base repo | |
4 | $ hg init a |
|
4 | $ hg init a |
@@ -17,7 +17,7 b' add first sub' | |||||
17 | $ hg init s |
|
17 | $ hg init s | |
18 | $ echo a > s/a |
|
18 | $ echo a > s/a | |
19 |
|
19 | |||
20 |
|
|
20 | Issue2232: committing a subrepo without .hgsub | |
21 |
|
21 | |||
22 | $ hg ci -mbad s |
|
22 | $ hg ci -mbad s | |
23 | abort: can't commit subrepos without .hgsub |
|
23 | abort: can't commit subrepos without .hgsub | |
@@ -34,7 +34,7 b' issue2232 - committing a subrepo without' | |||||
34 | $ hg ci -m1 |
|
34 | $ hg ci -m1 | |
35 | committing subrepository s |
|
35 | committing subrepository s | |
36 |
|
36 | |||
37 |
|
|
37 | Issue2022: update -C | |
38 |
|
38 | |||
39 | $ echo b > s/a |
|
39 | $ echo b > s/a | |
40 | $ hg sum |
|
40 | $ hg sum | |
@@ -365,7 +365,8 b' bogus subrepo path aborts' | |||||
365 | abort: missing ] in subrepo source |
|
365 | abort: missing ] in subrepo source | |
366 | [255] |
|
366 | [255] | |
367 |
|
367 | |||
368 | issue 1986 |
|
368 | Issue1986: merge aborts when trying to merge a subrepo that | |
|
369 | shouldn't need merging | |||
369 |
|
370 | |||
370 |
|
|
371 | # subrepo layout | |
371 |
|
|
372 | # | |
@@ -546,7 +547,7 b' test repository cloning' | |||||
546 | default = */test-subrepo.t/sub/mercurial/nested_relative (glob) |
|
547 | default = */test-subrepo.t/sub/mercurial/nested_relative (glob) | |
547 | $ rm -rf mercurial mercurial2 |
|
548 | $ rm -rf mercurial mercurial2 | |
548 |
|
549 | |||
549 | issue 1977 |
|
550 | Issue1977: multirepo push should fail if subrepo push fails | |
550 |
|
551 | |||
551 | $ hg init repo |
|
552 | $ hg init repo | |
552 | $ hg init repo/s |
|
553 | $ hg init repo/s |
@@ -240,7 +240,7 b' copies' | |||||
240 | dangling2 -> void |
|
240 | dangling2 -> void | |
241 |
|
241 | |||
242 |
|
242 | |||
243 | issue995 |
|
243 | Issue995: hg copy -A incorrectly handles symbolic links | |
244 |
|
244 | |||
245 | $ hg up -C |
|
245 | $ hg up -C | |
246 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
246 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
@@ -148,7 +148,8 b' cloning local tags' | |||||
148 |
|
148 | |||
149 | $ cd test |
|
149 | $ cd test | |
150 |
|
150 | |||
151 | issue 601 |
|
151 | Issue601: hg tag doesn't do the right thing if .hgtags or localtags | |
|
152 | doesn't end with EOL | |||
152 |
|
153 | |||
153 | $ python << EOF |
|
154 | $ python << EOF | |
154 | > f = file('.hg/localtags'); last = f.readlines()[-1][:-1]; f.close() |
|
155 | > f = file('.hg/localtags'); last = f.readlines()[-1][:-1]; f.close() |
General Comments 0
You need to be logged in to leave comments.
Login now