| spectral | |
| martinvonz |
| hg-reviewers |
It looks like Git 2.16 removed the "..." from some strings.
Glob over those characters in the test output.
| Lint Skipped |
| Unit Tests Skipped |
| $ cd ../td/s | $ cd ../td/s | ||||
| $ git remote set-url origin $TESTTMP/tb/s | $ git remote set-url origin $TESTTMP/tb/s | ||||
| $ git branch --no-track oldtesting | $ git branch --no-track oldtesting | ||||
| $ cd .. | $ cd .. | ||||
| $ hg pull -q ../tb | $ hg pull -q ../tb | ||||
| $ hg up | $ hg up | ||||
| From $TESTTMP/tb/s | From $TESTTMP/tb/s | ||||
| * [new branch] b2 -> origin/b2 | * [new branch] b2 -> origin/b2 | ||||
| Previous HEAD position was f47b465... merge | Previous HEAD position was f47b465* merge (glob) | ||||
| Switched to a new branch 'b2' | Switched to a new branch 'b2' | ||||
| pulling subrepo s from $TESTTMP/tb/s | pulling subrepo s from $TESTTMP/tb/s | ||||
| 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||||
| update to a revision without the subrepo, keeping the local git repository | update to a revision without the subrepo, keeping the local git repository | ||||
| $ cd ../t | $ cd ../t | ||||
| $ hg up 0 | $ hg up 0 | ||||
| $ hg id -n | $ hg id -n | ||||
| 7 | 7 | ||||
| $ cd s | $ cd s | ||||
| $ git rev-parse HEAD | $ git rev-parse HEAD | ||||
| 32a343883b74769118bb1d3b4b1fbf9156f4dddc | 32a343883b74769118bb1d3b4b1fbf9156f4dddc | ||||
| $ cd .. | $ cd .. | ||||
| $ cd s | $ cd s | ||||
| $ git checkout aa84837ccfbdfedcdcdeeedc309d73e6eb069edc | $ git checkout aa84837ccfbdfedcdcdeeedc309d73e6eb069edc | ||||
| Previous HEAD position was 32a3438... fff | Previous HEAD position was 32a3438* fff (glob) | ||||
| HEAD is now at aa84837... f | HEAD is now at aa84837* f (glob) | ||||
| $ cd .. | $ cd .. | ||||
| $ hg update 1 | $ hg update 1 | ||||
| subrepository s diverged (local revision: 32a3438, remote revision: da5f5b1) | subrepository s diverged (local revision: 32a3438, remote revision: da5f5b1) | ||||
| (M)erge, keep (l)ocal [working copy] or keep (r)emote [destination]? m | (M)erge, keep (l)ocal [working copy] or keep (r)emote [destination]? m | ||||
| subrepository sources for s differ (in checked out version) | subrepository sources for s differ (in checked out version) | ||||
| use (l)ocal source (32a3438) or (r)emote source (da5f5b1)? l | use (l)ocal source (32a3438) or (r)emote source (da5f5b1)? l | ||||
| 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||||
| $ hg id -n | $ hg id -n | ||||
| $ cd s | $ cd s | ||||
| $ git rev-parse HEAD | $ git rev-parse HEAD | ||||
| 32a343883b74769118bb1d3b4b1fbf9156f4dddc | 32a343883b74769118bb1d3b4b1fbf9156f4dddc | ||||
| $ cd .. | $ cd .. | ||||
| Test subrepo already at intended revision: | Test subrepo already at intended revision: | ||||
| $ cd s | $ cd s | ||||
| $ git checkout 32a343883b74769118bb1d3b4b1fbf9156f4dddc | $ git checkout 32a343883b74769118bb1d3b4b1fbf9156f4dddc | ||||
| HEAD is now at 32a3438... fff | HEAD is now at 32a3438* fff (glob) | ||||
| $ cd .. | $ cd .. | ||||
| $ hg update 1 | $ hg update 1 | ||||
| Previous HEAD position was 32a3438... fff | Previous HEAD position was 32a3438* fff (glob) | ||||
| HEAD is now at da5f5b1... g | HEAD is now at da5f5b1* g (glob) | ||||
| 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||||
| $ hg id -n | $ hg id -n | ||||
| 1 | 1 | ||||
| $ cd s | $ cd s | ||||
| $ git rev-parse HEAD | $ git rev-parse HEAD | ||||
| da5f5b1d8ffcf62fb8327bcd3c89a4367a6018e7 | da5f5b1d8ffcf62fb8327bcd3c89a4367a6018e7 | ||||
| $ cd .. | $ cd .. | ||||