equal
deleted
inserted
replaced
158 echo e > e |
158 echo e > e |
159 hg ci -Am1 |
159 hg ci -Am1 |
160 |
160 |
161 hg up 5 |
161 hg up 5 |
162 hg merge 4 # try to merge default into br again |
162 hg merge 4 # try to merge default into br again |
|
163 cd .. |
|
164 |
|
165 echo % test repository cloning |
|
166 mkdir mercurial mercurial2 |
|
167 hg init nested_absolute |
|
168 echo test > nested_absolute/foo |
|
169 hg -R nested_absolute add |
|
170 hg -R nested_absolute ci -mtest |
|
171 cd mercurial |
|
172 hg init nested_relative |
|
173 echo test2 > nested_relative/foo2 |
|
174 hg -R nested_relative add |
|
175 hg -R nested_relative ci -mtest2 |
|
176 hg init main |
|
177 echo nested_relative = ../nested_relative > main/.hgsub |
|
178 echo nested_absolute = $PWD/nested_absolute >> main/.hgsub |
|
179 hg -R main add |
|
180 hg -R main ci -m "add subrepos" |
|
181 cd .. |
|
182 hg clone mercurial/main mercurial2/main |
|
183 cat mercurial2/main/nested_absolute/.hg/hgrc mercurial2/main/nested_relative/.hg/hgrc | sed "s:${PWD}:/tmp:" |
|
184 rm -rf mercurial mercurial2 |
163 |
185 |
164 exit 0 |
186 exit 0 |