| author | Adrian Buehlmann <adrian@cadifra.com> |
| Tue, 14 Sep 2010 12:20:51 +0200 | |
| changeset 12279 | 28e2e3804f2e |
| parent 10358 | tests/test-pull-r@d42821cd5c96 |
| child 12316 | 4134686b83e1 |
| permissions | -rwxr-xr-x |
| 12279 | 1 |
$ hg init repo |
2 |
$ cd repo |
|
3 |
$ echo foo > foo |
|
4 |
$ hg ci -qAm 'add foo' |
|
5 |
$ echo >> foo |
|
6 |
$ hg ci -m 'change foo' |
|
7 |
$ hg up -qC 0 |
|
8 |
$ echo bar > bar |
|
9 |
$ hg ci -qAm 'add bar' |
|
|
5221
8ede77c2d008
pull -r: pass the revisions as the heads argument of findincoming
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
10 |
|
| 12279 | 11 |
$ hg log |
12 |
changeset: 2:effea6de0384 |
|
13 |
tag: tip |
|
14 |
parent: 0:bbd179dfa0a7 |
|
15 |
user: test |
|
16 |
date: Thu Jan 01 00:00:00 1970 +0000 |
|
17 |
summary: add bar |
|
18 |
||
19 |
changeset: 1:ed1b79f46b9a |
|
20 |
user: test |
|
21 |
date: Thu Jan 01 00:00:00 1970 +0000 |
|
22 |
summary: change foo |
|
23 |
||
24 |
changeset: 0:bbd179dfa0a7 |
|
25 |
user: test |
|
26 |
date: Thu Jan 01 00:00:00 1970 +0000 |
|
27 |
summary: add foo |
|
28 |
||
29 |
$ cd .. |
|
30 |
$ hg init copy |
|
31 |
$ cd copy |
|
32 |
||
33 |
Pull a missing revision: |
|
|
5221
8ede77c2d008
pull -r: pass the revisions as the heads argument of findincoming
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
34 |
|
| 12279 | 35 |
$ hg pull -qr missing ../repo |
36 |
abort: unknown revision 'missing'! |
|
37 |
||
38 |
Pull multiple revisions with update: |
|
|
6405
b8346ae5d64b
commands: fix shadowed repo module
Patrick Mezard <pmezard@gmail.com>
parents:
5221
diff
changeset
|
39 |
|
| 12279 | 40 |
$ hg pull -qu -r 0 -r 1 ../repo |
41 |
$ hg -q parents |
|
42 |
0:bbd179dfa0a7 |
|
43 |
$ hg rollback |
|
44 |
rolling back to revision -1 (undo pull) |
|
|
10358
d42821cd5c96
pull: with -u and -r, update to the first revision given
Sune Foldager <cryo@cyanite.org>
parents:
8167
diff
changeset
|
45 |
|
| 12279 | 46 |
$ hg pull -qr 0 ../repo |
47 |
$ hg log |
|
48 |
changeset: 0:bbd179dfa0a7 |
|
49 |
tag: tip |
|
50 |
user: test |
|
51 |
date: Thu Jan 01 00:00:00 1970 +0000 |
|
52 |
summary: add foo |
|
53 |
||
54 |
$ hg pull -qr 1 ../repo |
|
55 |
$ hg log |
|
56 |
changeset: 1:ed1b79f46b9a |
|
57 |
tag: tip |
|
58 |
user: test |
|
59 |
date: Thu Jan 01 00:00:00 1970 +0000 |
|
60 |
summary: change foo |
|
61 |
||
62 |
changeset: 0:bbd179dfa0a7 |
|
63 |
user: test |
|
64 |
date: Thu Jan 01 00:00:00 1970 +0000 |
|
65 |
summary: add foo |
|
66 |
||
|
5221
8ede77c2d008
pull -r: pass the revisions as the heads argument of findincoming
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
67 |
|
| 12279 | 68 |
This used to abort: received changelog group is empty: |
|
5221
8ede77c2d008
pull -r: pass the revisions as the heads argument of findincoming
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
69 |
|
| 12279 | 70 |
$ hg pull -qr 1 ../repo |
71 |