Mercurial > hg-stable
annotate tests/test-pull-r.t @ 12933:7a2bca0b1e70
merge with stable
| author | Matt Mackall <mpm@selenic.com> |
|---|---|
| date | Fri, 05 Nov 2010 15:38:23 -0500 |
| parents | 4134686b83e1 |
| children | 1e497df514e2 |
| rev | line source |
|---|---|
| 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'! | |
|
12316
4134686b83e1
tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents:
12279
diff
changeset
|
37 [255] |
| 12279 | 38 |
| 39 Pull multiple revisions with update: | |
|
6405
b8346ae5d64b
commands: fix shadowed repo module
Patrick Mezard <pmezard@gmail.com>
parents:
5221
diff
changeset
|
40 |
| 12279 | 41 $ hg pull -qu -r 0 -r 1 ../repo |
| 42 $ hg -q parents | |
| 43 0:bbd179dfa0a7 | |
| 44 $ hg rollback | |
| 45 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
|
46 |
| 12279 | 47 $ hg pull -qr 0 ../repo |
| 48 $ hg log | |
| 49 changeset: 0:bbd179dfa0a7 | |
| 50 tag: tip | |
| 51 user: test | |
| 52 date: Thu Jan 01 00:00:00 1970 +0000 | |
| 53 summary: add foo | |
| 54 | |
| 55 $ hg pull -qr 1 ../repo | |
| 56 $ hg log | |
| 57 changeset: 1:ed1b79f46b9a | |
| 58 tag: tip | |
| 59 user: test | |
| 60 date: Thu Jan 01 00:00:00 1970 +0000 | |
| 61 summary: change foo | |
| 62 | |
| 63 changeset: 0:bbd179dfa0a7 | |
| 64 user: test | |
| 65 date: Thu Jan 01 00:00:00 1970 +0000 | |
| 66 summary: add foo | |
| 67 | |
|
5221
8ede77c2d008
pull -r: pass the revisions as the heads argument of findincoming
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
68 |
| 12279 | 69 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
|
70 |
| 12279 | 71 $ hg pull -qr 1 ../repo |
| 72 |