Show More
@@ -4652,6 +4652,10 b' def revert(ui, repo, *pats, **opts):' | |||||
4652 | def badfn(path, msg): |
|
4652 | def badfn(path, msg): | |
4653 | if path in names: |
|
4653 | if path in names: | |
4654 | return |
|
4654 | return | |
|
4655 | if path in repo[node].substate: | |||
|
4656 | ui.warn("%s: %s\n" % (m.rel(path), | |||
|
4657 | 'reverting subrepos is unsupported')) | |||
|
4658 | return | |||
4655 | path_ = path + '/' |
|
4659 | path_ = path + '/' | |
4656 | for f in names: |
|
4660 | for f in names: | |
4657 | if f.startswith(path_): |
|
4661 | if f.startswith(path_): |
@@ -34,6 +34,18 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 | Revert can't (yet) revert subrepos: | |||
|
38 | ||||
|
39 | $ echo b > s/a | |||
|
40 | $ hg revert s | |||
|
41 | s: reverting subrepos is unsupported | |||
|
42 | ||||
|
43 | Revert currently ignores subrepos by default | |||
|
44 | ||||
|
45 | $ hg revert -a | |||
|
46 | $ hg revert -R s -a -C | |||
|
47 | reverting s/a | |||
|
48 | ||||
37 | Issue2022: update -C |
|
49 | Issue2022: update -C | |
38 |
|
50 | |||
39 | $ echo b > s/a |
|
51 | $ echo b > s/a |
General Comments 0
You need to be logged in to leave comments.
Login now