75 added 6 changesets with 3 changes to 3 files |
80 added 6 changesets with 3 changes to 3 files |
76 new changesets *:* (glob) |
81 new changesets *:* (glob) |
77 updating to branch default |
82 updating to branch default |
78 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
83 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
79 $ cd narrow-local-changes |
84 $ cd narrow-local-changes |
80 $ cat >> $HGRCPATH << EOF |
|
81 > [experimental] |
|
82 > evolution=createmarkers |
|
83 > EOF |
|
84 $ echo local change >> d0/f |
85 $ echo local change >> d0/f |
85 $ hg ci -m 'local change to d0' |
86 $ hg ci -m 'local change to d0' |
86 $ hg co '.^' |
87 $ hg co '.^' |
87 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
88 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
88 $ echo local change >> d3/f |
89 $ echo local change >> d3/f |
155 local change |
156 local change |
156 Pruned commits affecting removed paths should not prevent narrowing |
157 Pruned commits affecting removed paths should not prevent narrowing |
157 $ hg co '.^' |
158 $ hg co '.^' |
158 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
159 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
159 $ hg debugobsolete `hg log -T '{node}' -r 'desc("local change to d0")'` |
160 $ hg debugobsolete `hg log -T '{node}' -r 'desc("local change to d0")'` |
|
161 1 new obsolescence markers |
160 obsoleted 1 changesets |
162 obsoleted 1 changesets |
161 $ hg tracked --removeinclude d0 |
163 $ hg tracked --removeinclude d0 |
162 comparing with ssh://user@dummy/master |
164 comparing with ssh://user@dummy/master |
163 searching for changes |
165 searching for changes |
164 looking for local changes to affected paths |
166 looking for local changes to affected paths |
443 ^[0-9a-f]{12}$ (re) |
445 ^[0-9a-f]{12}$ (re) |
444 ^[0-9a-f]{12}$ (re) |
446 ^[0-9a-f]{12}$ (re) |
445 abort: local changes found |
447 abort: local changes found |
446 (use --force-delete-local-changes to ignore) |
448 (use --force-delete-local-changes to ignore) |
447 [255] |
449 [255] |
|
450 $ cd .. |
|
451 |
|
452 Test --auto-remove-includes |
|
453 $ hg clone --narrow ssh://user@dummy/master narrow-auto-remove -q \ |
|
454 > --include d0 --include d1 --include d2 |
|
455 $ cd narrow-auto-remove |
|
456 $ echo a >> d0/f |
|
457 $ hg ci -m 'local change to d0' |
|
458 $ hg co '.^' |
|
459 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
460 $ echo a >> d1/f |
|
461 $ hg ci -m 'local change to d1' |
|
462 created new head |
|
463 $ hg debugobsolete $(hg log -T '{node}' -r 'desc("local change to d0")') |
|
464 1 new obsolescence markers |
|
465 obsoleted 1 changesets |
|
466 $ echo n | hg tracked --auto-remove-includes --config ui.interactive=yes |
|
467 comparing with ssh://user@dummy/master |
|
468 searching for changes |
|
469 looking for unused includes to remove |
|
470 path:d0 |
|
471 path:d2 |
|
472 remove these unused includes (yn)? n |
|
473 $ hg tracked --auto-remove-includes |
|
474 comparing with ssh://user@dummy/master |
|
475 searching for changes |
|
476 looking for unused includes to remove |
|
477 path:d0 |
|
478 path:d2 |
|
479 remove these unused includes (yn)? y |
|
480 looking for local changes to affected paths |
|
481 saved backup bundle to $TESTTMP/narrow-auto-remove/.hg/strip-backup/*-narrow.hg (glob) |
|
482 deleting data/d0/f.i |
|
483 deleting data/d2/f.i |
|
484 deleting meta/d0/00manifest.i (tree !) |
|
485 deleting meta/d2/00manifest.i (tree !) |
|
486 $ hg tracked |
|
487 I path:d1 |
|
488 $ hg files |
|
489 d1/f |
|
490 $ hg tracked --auto-remove-includes |
|
491 comparing with ssh://user@dummy/master |
|
492 searching for changes |
|
493 looking for unused includes to remove |
|
494 found no unused includes |