Mercurial > hg
comparison tests/test-narrow-widen-no-ellipsis.t @ 39963:693dda764efe
narrow: don't do the dirstate dance if ellipses is not enabled
I believe we set dirstate parents to nullid before widening pull because in
ellipses cases, the parent might be stripped off with a new changeset. However
the second ds.setparents() call invalidate my assumption. I am not sure why we
do this. So here is a patch.
This patch also adds tests showing we break nothing in non-ellipses cases.
Differential Revision: https://phab.mercurial-scm.org/D4788
author | Pulkit Goyal <pulkit@yandex-team.ru> |
---|---|
date | Sun, 30 Sep 2018 18:59:27 +0300 |
parents | 254361f727bd |
children | 8feae5b989bc |
comparison
equal
deleted
inserted
replaced
39962:fa2395659828 | 39963:693dda764efe |
---|---|
86 | 86 |
87 Widen the narrow spec to see the widest file. This should not get the newly | 87 Widen the narrow spec to see the widest file. This should not get the newly |
88 added upstream revisions. | 88 added upstream revisions. |
89 | 89 |
90 $ cd narrow | 90 $ cd narrow |
91 $ hg id -n | |
92 2 | |
93 | |
91 $ hg tracked --addinclude widest/f --debug | 94 $ hg tracked --addinclude widest/f --debug |
92 comparing with ssh://user@dummy/master | 95 comparing with ssh://user@dummy/master |
93 running python "*dummyssh" *user@dummy* *hg -R master serve --stdio* (glob) | 96 running python "*dummyssh" *user@dummy* *hg -R master serve --stdio* (glob) |
94 sending hello command | 97 sending hello command |
95 sending between command | 98 sending between command |
125 I path:widest/f | 128 I path:widest/f |
126 | 129 |
127 $ cat widest/f | 130 $ cat widest/f |
128 widest | 131 widest |
129 | 132 |
133 $ hg id -n | |
134 2 | |
135 | |
130 Pull down the newly added upstream revision. | 136 Pull down the newly added upstream revision. |
131 | 137 |
132 $ hg pull | 138 $ hg pull |
133 pulling from ssh://user@dummy/master | 139 pulling from ssh://user@dummy/master |
134 searching for changes | 140 searching for changes |