equal
deleted
inserted
replaced
15 $ echo s = s > .hgsub |
15 $ echo s = s > .hgsub |
16 $ hg add .hgsub |
16 $ hg add .hgsub |
17 $ hg init s |
17 $ hg init s |
18 $ echo a > s/a |
18 $ echo a > s/a |
19 |
19 |
20 issue2232 - committing a subrepo without .hgsub |
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 |
24 [255] |
24 [255] |
25 |
25 |
32 commit: 1 added, 1 subrepos |
32 commit: 1 added, 1 subrepos |
33 update: (current) |
33 update: (current) |
34 $ hg ci -m1 |
34 $ hg ci -m1 |
35 committing subrepository s |
35 committing subrepository s |
36 |
36 |
37 issue 2022 - update -C |
37 Issue2022: update -C |
38 |
38 |
39 $ echo b > s/a |
39 $ echo b > s/a |
40 $ hg sum |
40 $ hg sum |
41 parent: 1:7cf8cfea66e4 tip |
41 parent: 1:7cf8cfea66e4 tip |
42 1 |
42 1 |
363 $ echo 'bogus=[boguspath' >> .hgsub |
363 $ echo 'bogus=[boguspath' >> .hgsub |
364 $ hg ci -m 'bogus subrepo path' |
364 $ hg ci -m 'bogus subrepo path' |
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 # subrepo layout |
371 # subrepo layout |
371 # |
372 # |
372 # o 5 br |
373 # o 5 br |
373 # /| |
374 # /| |
544 default = */test-subrepo.t/sub/mercurial/nested_absolute (glob) |
545 default = */test-subrepo.t/sub/mercurial/nested_absolute (glob) |
545 [paths] |
546 [paths] |
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 |
553 $ echo a > repo/s/a |
554 $ echo a > repo/s/a |
554 $ hg -R repo/s ci -Am0 |
555 $ hg -R repo/s ci -Am0 |