Mercurial > hg
annotate tests/test-pull-r.out @ 5279:2dbd750b3ddd
convert: clear the dirstate before a conversion, invalidate it afterwards
Clearing it before the conversion protects us from whatever data were
there (file copies in particular).
Invalidating it after the conversion avoids writing a possibly
inconsistent dirstate to disk.
author | Alexis S. L. Carvalho <alexis@cecm.usp.br> |
---|---|
date | Sat, 01 Sep 2007 02:49:18 -0300 |
parents | 8ede77c2d008 |
children | b8346ae5d64b |
rev | line source |
---|---|
5221
8ede77c2d008
pull -r: pass the revisions as the heads argument of findincoming
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
1 changeset: 2:effea6de0384 |
8ede77c2d008
pull -r: pass the revisions as the heads argument of findincoming
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
2 tag: tip |
8ede77c2d008
pull -r: pass the revisions as the heads argument of findincoming
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
3 parent: 0:bbd179dfa0a7 |
8ede77c2d008
pull -r: pass the revisions as the heads argument of findincoming
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
4 user: test |
8ede77c2d008
pull -r: pass the revisions as the heads argument of findincoming
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
5 date: Thu Jan 01 00:00:00 1970 +0000 |
8ede77c2d008
pull -r: pass the revisions as the heads argument of findincoming
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
6 summary: add bar |
8ede77c2d008
pull -r: pass the revisions as the heads argument of findincoming
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
7 |
8ede77c2d008
pull -r: pass the revisions as the heads argument of findincoming
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
8 changeset: 1:ed1b79f46b9a |
8ede77c2d008
pull -r: pass the revisions as the heads argument of findincoming
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
9 user: test |
8ede77c2d008
pull -r: pass the revisions as the heads argument of findincoming
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
10 date: Thu Jan 01 00:00:00 1970 +0000 |
8ede77c2d008
pull -r: pass the revisions as the heads argument of findincoming
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
11 summary: change foo |
8ede77c2d008
pull -r: pass the revisions as the heads argument of findincoming
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
12 |
8ede77c2d008
pull -r: pass the revisions as the heads argument of findincoming
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
13 changeset: 0:bbd179dfa0a7 |
8ede77c2d008
pull -r: pass the revisions as the heads argument of findincoming
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
14 user: test |
8ede77c2d008
pull -r: pass the revisions as the heads argument of findincoming
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
15 date: Thu Jan 01 00:00:00 1970 +0000 |
8ede77c2d008
pull -r: pass the revisions as the heads argument of findincoming
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
16 summary: add foo |
8ede77c2d008
pull -r: pass the revisions as the heads argument of findincoming
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
17 |
8ede77c2d008
pull -r: pass the revisions as the heads argument of findincoming
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
18 % pull -r 0 |
8ede77c2d008
pull -r: pass the revisions as the heads argument of findincoming
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
19 changeset: 0:bbd179dfa0a7 |
8ede77c2d008
pull -r: pass the revisions as the heads argument of findincoming
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
20 tag: tip |
8ede77c2d008
pull -r: pass the revisions as the heads argument of findincoming
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
21 user: test |
8ede77c2d008
pull -r: pass the revisions as the heads argument of findincoming
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
22 date: Thu Jan 01 00:00:00 1970 +0000 |
8ede77c2d008
pull -r: pass the revisions as the heads argument of findincoming
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
23 summary: add foo |
8ede77c2d008
pull -r: pass the revisions as the heads argument of findincoming
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
24 |
8ede77c2d008
pull -r: pass the revisions as the heads argument of findincoming
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
25 % pull -r 1 |
8ede77c2d008
pull -r: pass the revisions as the heads argument of findincoming
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
26 changeset: 1:ed1b79f46b9a |
8ede77c2d008
pull -r: pass the revisions as the heads argument of findincoming
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
27 tag: tip |
8ede77c2d008
pull -r: pass the revisions as the heads argument of findincoming
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
28 user: test |
8ede77c2d008
pull -r: pass the revisions as the heads argument of findincoming
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
29 date: Thu Jan 01 00:00:00 1970 +0000 |
8ede77c2d008
pull -r: pass the revisions as the heads argument of findincoming
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
30 summary: change foo |
8ede77c2d008
pull -r: pass the revisions as the heads argument of findincoming
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
31 |
8ede77c2d008
pull -r: pass the revisions as the heads argument of findincoming
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
32 changeset: 0:bbd179dfa0a7 |
8ede77c2d008
pull -r: pass the revisions as the heads argument of findincoming
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
33 user: test |
8ede77c2d008
pull -r: pass the revisions as the heads argument of findincoming
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
34 date: Thu Jan 01 00:00:00 1970 +0000 |
8ede77c2d008
pull -r: pass the revisions as the heads argument of findincoming
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
35 summary: add foo |
8ede77c2d008
pull -r: pass the revisions as the heads argument of findincoming
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
36 |
8ede77c2d008
pull -r: pass the revisions as the heads argument of findincoming
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
37 % pull -r 1 again |