Show More
@@ -204,7 +204,7 b' def add(ui, repo, *pats, **opts):' | |||||
204 | return rejected and 1 or 0 |
|
204 | return rejected and 1 or 0 | |
205 |
|
205 | |||
206 | @command('addremove', |
|
206 | @command('addremove', | |
207 | similarityopts + walkopts + dryrunopts, |
|
207 | similarityopts + subrepoopts + walkopts + dryrunopts, | |
208 | _('[OPTION]... [FILE]...'), |
|
208 | _('[OPTION]... [FILE]...'), | |
209 | inferrepo=True) |
|
209 | inferrepo=True) | |
210 | def addremove(ui, repo, *pats, **opts): |
|
210 | def addremove(ui, repo, *pats, **opts): |
@@ -81,6 +81,10 b' Interaction with Mercurial Commands' | |||||
81 | Git and Subversion subrepositories are currently silently |
|
81 | Git and Subversion subrepositories are currently silently | |
82 | ignored. |
|
82 | ignored. | |
83 |
|
83 | |||
|
84 | :addremove: addremove does not recurse into subrepos unless | |||
|
85 | -S/--subrepos is specified. Git and Subversion subrepositories | |||
|
86 | will print a warning and continue. | |||
|
87 | ||||
84 | :archive: archive does not recurse in subrepositories unless |
|
88 | :archive: archive does not recurse in subrepositories unless | |
85 | -S/--subrepos is specified. |
|
89 | -S/--subrepos is specified. | |
86 |
|
90 |
@@ -215,7 +215,7 b' Show all commands + options' | |||||
215 | status: all, modified, added, removed, deleted, clean, unknown, ignored, no-status, copies, print0, rev, change, include, exclude, subrepos, template |
|
215 | status: all, modified, added, removed, deleted, clean, unknown, ignored, no-status, copies, print0, rev, change, include, exclude, subrepos, template | |
216 | summary: remote |
|
216 | summary: remote | |
217 | update: clean, check, date, rev, tool |
|
217 | update: clean, check, date, rev, tool | |
218 | addremove: similarity, include, exclude, dry-run |
|
218 | addremove: similarity, subrepos, include, exclude, dry-run | |
219 | archive: no-decode, prefix, rev, type, subrepos, include, exclude |
|
219 | archive: no-decode, prefix, rev, type, subrepos, include, exclude | |
220 | backout: merge, parent, rev, edit, tool, include, exclude, message, logfile, date, user |
|
220 | backout: merge, parent, rev, edit, tool, include, exclude, message, logfile, date, user | |
221 | bisect: reset, good, bad, skip, extend, command, noupdate |
|
221 | bisect: reset, good, bad, skip, extend, command, noupdate |
@@ -128,11 +128,32 b' Check that deep archiving works' | |||||
128 | R sub1/.hgsubstate |
|
128 | R sub1/.hgsubstate | |
129 | R sub1/sub2/folder/test.txt |
|
129 | R sub1/sub2/folder/test.txt | |
130 | $ hg update -Cq |
|
130 | $ hg update -Cq | |
|
131 | $ touch sub1/foo | |||
|
132 | $ hg forget sub1/sub2/folder/test.txt | |||
|
133 | $ rm sub1/sub2/test.txt | |||
|
134 | ||||
|
135 | Test relative path printing + subrepos | |||
|
136 | $ mkdir -p foo/bar | |||
|
137 | $ cd foo | |||
|
138 | $ touch bar/abc | |||
|
139 | $ hg addremove -S .. | |||
|
140 | adding ../sub1/sub2/folder/test.txt (glob) | |||
|
141 | removing ../sub1/sub2/test.txt (glob) | |||
|
142 | adding ../sub1/foo (glob) | |||
|
143 | adding bar/abc (glob) | |||
|
144 | $ cd .. | |||
|
145 | $ hg status -S | |||
|
146 | A foo/bar/abc | |||
|
147 | A sub1/foo | |||
|
148 | R sub1/sub2/test.txt | |||
|
149 | $ hg update -Cq | |||
131 | $ rm sub1/sub2/folder/test.txt |
|
150 | $ rm sub1/sub2/folder/test.txt | |
132 | $ rm sub1/sub2/test.txt |
|
151 | $ rm sub1/sub2/test.txt | |
133 | $ hg ci -ASm "remove test.txt" |
|
152 | $ hg ci -ASm "remove test.txt" | |
134 | removing sub1/sub2/folder/test.txt (glob) |
|
153 | removing sub1/sub2/folder/test.txt (glob) | |
135 | removing sub1/sub2/test.txt (glob) |
|
154 | removing sub1/sub2/test.txt (glob) | |
|
155 | adding sub1/foo (glob) | |||
|
156 | adding foo/bar/abc | |||
136 | committing subrepository sub1 |
|
157 | committing subrepository sub1 | |
137 | committing subrepository sub1/sub2 (glob) |
|
158 | committing subrepository sub1/sub2 (glob) | |
138 | $ hg rollback -q |
|
159 | $ hg rollback -q |
General Comments 0
You need to be logged in to leave comments.
Login now