equal
deleted
inserted
replaced
4 $ echo 'status = -S' >> $HGRCPATH |
4 $ echo 'status = -S' >> $HGRCPATH |
5 $ echo 'diff = --nodates -S' >> $HGRCPATH |
5 $ echo 'diff = --nodates -S' >> $HGRCPATH |
6 |
6 |
7 Create test repository: |
7 Create test repository: |
8 |
8 |
9 $ hg init |
9 $ hg init repo |
|
10 $ cd repo |
10 $ echo x1 > x.txt |
11 $ echo x1 > x.txt |
11 |
12 |
12 $ hg init foo |
13 $ hg init foo |
13 $ cd foo |
14 $ cd foo |
14 $ echo y1 > y.txt |
15 $ echo y1 > y.txt |
223 --- a/foo/bar/z.txt |
224 --- a/foo/bar/z.txt |
224 +++ b/foo/bar/z.txt |
225 +++ b/foo/bar/z.txt |
225 @@ -1,1 +1,2 @@ |
226 @@ -1,1 +1,2 @@ |
226 z1 |
227 z1 |
227 +z2 |
228 +z2 |
|
229 |
|
230 Clone and test outgoing: |
|
231 |
|
232 $ cd .. |
|
233 $ hg clone repo repo2 |
|
234 updating to branch default |
|
235 pulling subrepo foo from .*/test-subrepo-recursion.t/repo/foo |
|
236 requesting all changes |
|
237 adding changesets |
|
238 adding manifests |
|
239 adding file changes |
|
240 added 4 changesets with 7 changes to 3 files |
|
241 pulling subrepo foo/bar from .*/test-subrepo-recursion.t/repo/foo/bar |
|
242 requesting all changes |
|
243 adding changesets |
|
244 adding manifests |
|
245 adding file changes |
|
246 added 3 changesets with 3 changes to 1 files |
|
247 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
248 $ cd repo2 |
|
249 $ hg outgoing -S |
|
250 comparing with .*/test-subrepo-recursion.t/repo |
|
251 searching for changes |
|
252 no changes found |
|
253 comparing with .*/test-subrepo-recursion.t/repo/foo |
|
254 searching for changes |
|
255 no changes found |
|
256 $ echo $? |
|
257 0 |
|
258 |
|
259 Make nested change: |
|
260 |
|
261 $ echo y4 >> foo/y.txt |
|
262 $ hg diff |
|
263 diff -r 65903cebad86 foo/y.txt |
|
264 --- a/foo/y.txt |
|
265 +++ b/foo/y.txt |
|
266 @@ -1,3 +1,4 @@ |
|
267 y1 |
|
268 y2 |
|
269 y3 |
|
270 +y4 |
|
271 $ hg commit -m 3-4-2 |
|
272 committing subrepository foo |
|
273 $ hg outgoing -S |
|
274 comparing with .*/test-subrepo-recursion.t/repo |
|
275 searching for changes |
|
276 changeset: 3:2655b8ecc4ee |
|
277 tag: tip |
|
278 user: test |
|
279 date: Thu Jan 01 00:00:00 1970 +0000 |
|
280 summary: 3-4-2 |
|
281 |
|
282 comparing with .*/test-subrepo-recursion.t/repo/foo |
|
283 searching for changes |
|
284 changeset: 4:e96193d6cb36 |
|
285 tag: tip |
|
286 user: test |
|
287 date: Thu Jan 01 00:00:00 1970 +0000 |
|
288 summary: 3-4-2 |
|
289 |