Mercurial > hg
comparison tests/test-fetch @ 2830:49988d9f0758
Merge with crew, fix most tests
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Wed, 09 Aug 2006 13:55:18 -0500 |
parents | e0caea53c997 |
children | 61fcd9fac434 |
comparison
equal
deleted
inserted
replaced
2815:4870f795f681 | 2830:49988d9f0758 |
---|---|
1 #!/bin/sh | |
2 | |
3 HGRCPATH=$HGTMP/.hgrc; export HGRCPATH | |
4 echo "[extensions]" >> $HGTMP/.hgrc | |
5 echo "fetch=" >> $HGTMP/.hgrc | |
6 | |
7 hg init a | |
8 echo a > a/a | |
9 hg --cwd a commit -d '1 0' -Ama | |
10 | |
11 hg clone a b | |
12 hg clone a c | |
13 | |
14 echo b > a/b | |
15 hg --cwd a commit -d '2 0' -Amb | |
16 hg --cwd a parents -q | |
17 | |
18 echo % should pull one change | |
19 hg --cwd b fetch ../a | |
20 hg --cwd b parents -q | |
21 | |
22 echo c > c/c | |
23 hg --cwd c commit -d '3 0' -Amc | |
24 hg --cwd c fetch -d '4 0' -m 'automated merge' ../a | |
25 ls c |