equal
deleted
inserted
replaced
205 cat mercurial2/main/nested_absolute/.hg/hgrc \ |
205 cat mercurial2/main/nested_absolute/.hg/hgrc \ |
206 mercurial2/main/nested_relative/.hg/hgrc \ |
206 mercurial2/main/nested_relative/.hg/hgrc \ |
207 | "$TESTDIR/filtertmp.py" |
207 | "$TESTDIR/filtertmp.py" |
208 rm -rf mercurial mercurial2 |
208 rm -rf mercurial mercurial2 |
209 |
209 |
|
210 echo % issue 1977 |
|
211 hg init repo |
|
212 hg init repo/s |
|
213 echo a > repo/s/a |
|
214 hg -R repo/s ci -Am0 |
|
215 echo s = s > repo/.hgsub |
|
216 hg -R repo ci -Am1 |
|
217 hg clone repo repo2 |
|
218 hg -q -R repo2 pull -u |
|
219 echo 1 > repo2/s/a |
|
220 hg -R repo2/s ci -m2 |
|
221 hg -q -R repo2/s push |
|
222 hg -R repo2/s up -C 0 |
|
223 echo 2 > repo2/s/a |
|
224 hg -R repo2/s ci -m3 |
|
225 hg -R repo2 ci -m3 |
|
226 hg -q -R repo2 push |
|
227 hg -R repo update |
|
228 rm -rf repo2 repo |
|
229 |
210 exit 0 |
230 exit 0 |