equal
deleted
inserted
replaced
96 looking for local changes to affected paths |
96 looking for local changes to affected paths |
97 The following changeset(s) or their ancestors have local changes not on the remote: |
97 The following changeset(s) or their ancestors have local changes not on the remote: |
98 * (glob) |
98 * (glob) |
99 abort: local changes found |
99 abort: local changes found |
100 (use --force-delete-local-changes to ignore) |
100 (use --force-delete-local-changes to ignore) |
101 [255] |
101 [20] |
102 Check that nothing was removed by the failed attempts |
102 Check that nothing was removed by the failed attempts |
103 $ hg tracked |
103 $ hg tracked |
104 I path:d0 |
104 I path:d0 |
105 I path:d3 |
105 I path:d3 |
106 I path:d6 |
106 I path:d6 |
420 ^[0-9a-f]{12}$ (re) |
420 ^[0-9a-f]{12}$ (re) |
421 ^[0-9a-f]{12}$ (re) |
421 ^[0-9a-f]{12}$ (re) |
422 ...and 5 more, use --verbose to list all |
422 ...and 5 more, use --verbose to list all |
423 abort: local changes found |
423 abort: local changes found |
424 (use --force-delete-local-changes to ignore) |
424 (use --force-delete-local-changes to ignore) |
425 [255] |
425 [20] |
426 Now test it *with* verbose. |
426 Now test it *with* verbose. |
427 $ hg tracked --removeinclude d9 --verbose |
427 $ hg tracked --removeinclude d9 --verbose |
428 comparing with ssh://user@dummy/master |
428 comparing with ssh://user@dummy/master |
429 searching for changes |
429 searching for changes |
430 looking for local changes to affected paths |
430 looking for local changes to affected paths |
444 ^[0-9a-f]{12}$ (re) |
444 ^[0-9a-f]{12}$ (re) |
445 ^[0-9a-f]{12}$ (re) |
445 ^[0-9a-f]{12}$ (re) |
446 ^[0-9a-f]{12}$ (re) |
446 ^[0-9a-f]{12}$ (re) |
447 abort: local changes found |
447 abort: local changes found |
448 (use --force-delete-local-changes to ignore) |
448 (use --force-delete-local-changes to ignore) |
449 [255] |
449 [20] |
450 $ cd .. |
450 $ cd .. |
451 |
451 |
452 Test --auto-remove-includes |
452 Test --auto-remove-includes |
453 $ hg clone --narrow ssh://user@dummy/master narrow-auto-remove -q \ |
453 $ hg clone --narrow ssh://user@dummy/master narrow-auto-remove -q \ |
454 > --include d0 --include d1 --include d2 |
454 > --include d0 --include d1 --include d2 |