equal
deleted
inserted
replaced
36 branch: default |
36 branch: default |
37 commit: 1 added, 1 subrepos |
37 commit: 1 added, 1 subrepos |
38 update: (current) |
38 update: (current) |
39 $ hg ci -m1 |
39 $ hg ci -m1 |
40 |
40 |
41 Revert can't (yet) revert subrepos: |
41 Revert subrepo: |
42 |
42 |
43 $ echo b > s/a |
43 $ echo b > s/a |
44 $ hg revert s |
44 $ hg revert s |
45 abort: cannot revert subrepos without --no-backup |
45 reverting subrepo s |
46 [255] |
46 reverting s/a |
47 |
47 $ rm s/a.orig |
48 Revert currently ignores subrepos by default |
48 |
49 |
49 Revert subrepo with no backup. The "reverting s/a" line is gone since |
50 $ hg revert -a |
50 we're really running 'hg update' in the subrepo: |
51 abort: cannot revert subrepos without --no-backup |
51 |
52 [255] |
52 $ echo b > s/a |
53 $ hg revert -R s -a -C |
53 $ hg revert --no-backup s |
54 reverting s/a (glob) |
54 reverting subrepo s |
55 |
55 |
56 Issue2022: update -C |
56 Issue2022: update -C |
57 |
57 |
58 $ echo b > s/a |
58 $ echo b > s/a |
59 $ hg sum |
59 $ hg sum |