equal
deleted
inserted
replaced
253 [255] |
253 [255] |
254 |
254 |
255 Add a normal file to the subrepo, then test archiving |
255 Add a normal file to the subrepo, then test archiving |
256 |
256 |
257 $ echo 'normal file' > subrepo/normal.txt |
257 $ echo 'normal file' > subrepo/normal.txt |
|
258 $ touch large.dat |
258 $ mv subrepo/large.txt subrepo/renamed-large.txt |
259 $ mv subrepo/large.txt subrepo/renamed-large.txt |
259 $ hg -R subrepo addremove --dry-run |
260 $ hg -R subrepo addremove --dry-run |
260 removing large.txt |
261 removing large.txt |
261 adding normal.txt |
262 adding normal.txt |
262 adding renamed-large.txt |
263 adding renamed-large.txt |
263 $ hg status -S |
264 $ hg status -S |
264 ! subrepo/large.txt |
265 ! subrepo/large.txt |
|
266 ? large.dat |
265 ? subrepo/normal.txt |
267 ? subrepo/normal.txt |
266 ? subrepo/renamed-large.txt |
268 ? subrepo/renamed-large.txt |
267 $ mv subrepo/renamed-large.txt subrepo/large.txt |
269 $ mv subrepo/renamed-large.txt subrepo/large.txt |
268 $ hg -R subrepo add subrepo/normal.txt |
270 $ hg -R subrepo add subrepo/normal.txt |
|
271 |
|
272 $ hg addremove |
|
273 adding large.dat as a largefile |
|
274 $ rm large.dat |
|
275 |
|
276 $ hg addremove |
|
277 removing large.dat |
269 |
278 |
270 Lock in subrepo, otherwise the change isn't archived |
279 Lock in subrepo, otherwise the change isn't archived |
271 |
280 |
272 $ hg ci -S -m "add normal file to top level" |
281 $ hg ci -S -m "add normal file to top level" |
273 committing subrepository subrepo |
282 committing subrepository subrepo |