Mercurial > hg
annotate tests/test-pull-r.t @ 46924:ca0049946e9a
split: avoid strip if split is a no-op (identical to original)
Differential Revision: https://phab.mercurial-scm.org/D10389
author | Kyle Lippincott <spectral@google.com> |
---|---|
date | Mon, 12 Apr 2021 19:25:34 -0700 |
parents | 95c4cca641f6 |
children | 8c4881c07f57 |
rev | line source |
---|---|
44545
bd7b2c8d06cc
pull: add `--confirm` flag to confirm before writing changes
Pulkit Goyal <7895pulkit@gmail.com>
parents:
35612
diff
changeset
|
1 $ cat <<EOF >> $HGRCPATH |
bd7b2c8d06cc
pull: add `--confirm` flag to confirm before writing changes
Pulkit Goyal <7895pulkit@gmail.com>
parents:
35612
diff
changeset
|
2 > [ui] |
bd7b2c8d06cc
pull: add `--confirm` flag to confirm before writing changes
Pulkit Goyal <7895pulkit@gmail.com>
parents:
35612
diff
changeset
|
3 > interactive = true |
bd7b2c8d06cc
pull: add `--confirm` flag to confirm before writing changes
Pulkit Goyal <7895pulkit@gmail.com>
parents:
35612
diff
changeset
|
4 > EOF |
bd7b2c8d06cc
pull: add `--confirm` flag to confirm before writing changes
Pulkit Goyal <7895pulkit@gmail.com>
parents:
35612
diff
changeset
|
5 |
bd7b2c8d06cc
pull: add `--confirm` flag to confirm before writing changes
Pulkit Goyal <7895pulkit@gmail.com>
parents:
35612
diff
changeset
|
6 |
12279 | 7 $ hg init repo |
8 $ cd repo | |
9 $ echo foo > foo | |
10 $ hg ci -qAm 'add foo' | |
11 $ echo >> foo | |
12 $ hg ci -m 'change foo' | |
13 $ hg up -qC 0 | |
14 $ echo bar > bar | |
15 $ 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
|
16 |
12279 | 17 $ hg log |
18 changeset: 2:effea6de0384 | |
19 tag: tip | |
20 parent: 0:bbd179dfa0a7 | |
21 user: test | |
22 date: Thu Jan 01 00:00:00 1970 +0000 | |
23 summary: add bar | |
24 | |
25 changeset: 1:ed1b79f46b9a | |
26 user: test | |
27 date: Thu Jan 01 00:00:00 1970 +0000 | |
28 summary: change foo | |
29 | |
30 changeset: 0:bbd179dfa0a7 | |
31 user: test | |
32 date: Thu Jan 01 00:00:00 1970 +0000 | |
33 summary: add foo | |
34 | |
35 $ cd .. | |
14036
90d997a812dc
changegroup: do not count closed new heads (issue2697)
Adrian Buehlmann <adrian@cadifra.com>
parents:
13446
diff
changeset
|
36 |
90d997a812dc
changegroup: do not count closed new heads (issue2697)
Adrian Buehlmann <adrian@cadifra.com>
parents:
13446
diff
changeset
|
37 don't show "(+1 heads)" message when pulling closed head |
90d997a812dc
changegroup: do not count closed new heads (issue2697)
Adrian Buehlmann <adrian@cadifra.com>
parents:
13446
diff
changeset
|
38 |
90d997a812dc
changegroup: do not count closed new heads (issue2697)
Adrian Buehlmann <adrian@cadifra.com>
parents:
13446
diff
changeset
|
39 $ hg clone -q repo repo2 |
90d997a812dc
changegroup: do not count closed new heads (issue2697)
Adrian Buehlmann <adrian@cadifra.com>
parents:
13446
diff
changeset
|
40 $ hg clone -q repo2 repo3 |
90d997a812dc
changegroup: do not count closed new heads (issue2697)
Adrian Buehlmann <adrian@cadifra.com>
parents:
13446
diff
changeset
|
41 $ cd repo2 |
90d997a812dc
changegroup: do not count closed new heads (issue2697)
Adrian Buehlmann <adrian@cadifra.com>
parents:
13446
diff
changeset
|
42 $ hg up -q 0 |
90d997a812dc
changegroup: do not count closed new heads (issue2697)
Adrian Buehlmann <adrian@cadifra.com>
parents:
13446
diff
changeset
|
43 $ echo hello >> foo |
90d997a812dc
changegroup: do not count closed new heads (issue2697)
Adrian Buehlmann <adrian@cadifra.com>
parents:
13446
diff
changeset
|
44 $ hg ci -mx1 |
90d997a812dc
changegroup: do not count closed new heads (issue2697)
Adrian Buehlmann <adrian@cadifra.com>
parents:
13446
diff
changeset
|
45 created new head |
90d997a812dc
changegroup: do not count closed new heads (issue2697)
Adrian Buehlmann <adrian@cadifra.com>
parents:
13446
diff
changeset
|
46 $ hg ci -mx2 --close-branch |
90d997a812dc
changegroup: do not count closed new heads (issue2697)
Adrian Buehlmann <adrian@cadifra.com>
parents:
13446
diff
changeset
|
47 $ cd ../repo3 |
90d997a812dc
changegroup: do not count closed new heads (issue2697)
Adrian Buehlmann <adrian@cadifra.com>
parents:
13446
diff
changeset
|
48 $ hg heads -q --closed |
90d997a812dc
changegroup: do not count closed new heads (issue2697)
Adrian Buehlmann <adrian@cadifra.com>
parents:
13446
diff
changeset
|
49 2:effea6de0384 |
90d997a812dc
changegroup: do not count closed new heads (issue2697)
Adrian Buehlmann <adrian@cadifra.com>
parents:
13446
diff
changeset
|
50 1:ed1b79f46b9a |
44545
bd7b2c8d06cc
pull: add `--confirm` flag to confirm before writing changes
Pulkit Goyal <7895pulkit@gmail.com>
parents:
35612
diff
changeset
|
51 $ hg pull --confirm << EOF |
bd7b2c8d06cc
pull: add `--confirm` flag to confirm before writing changes
Pulkit Goyal <7895pulkit@gmail.com>
parents:
35612
diff
changeset
|
52 > n |
bd7b2c8d06cc
pull: add `--confirm` flag to confirm before writing changes
Pulkit Goyal <7895pulkit@gmail.com>
parents:
35612
diff
changeset
|
53 > EOF |
35393
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
34661
diff
changeset
|
54 pulling from $TESTTMP/repo2 |
14036
90d997a812dc
changegroup: do not count closed new heads (issue2697)
Adrian Buehlmann <adrian@cadifra.com>
parents:
13446
diff
changeset
|
55 searching for changes |
90d997a812dc
changegroup: do not count closed new heads (issue2697)
Adrian Buehlmann <adrian@cadifra.com>
parents:
13446
diff
changeset
|
56 adding changesets |
90d997a812dc
changegroup: do not count closed new heads (issue2697)
Adrian Buehlmann <adrian@cadifra.com>
parents:
13446
diff
changeset
|
57 adding manifests |
90d997a812dc
changegroup: do not count closed new heads (issue2697)
Adrian Buehlmann <adrian@cadifra.com>
parents:
13446
diff
changeset
|
58 adding file changes |
44545
bd7b2c8d06cc
pull: add `--confirm` flag to confirm before writing changes
Pulkit Goyal <7895pulkit@gmail.com>
parents:
35612
diff
changeset
|
59 adding 2 changesets with 1 changes to 1 files |
bd7b2c8d06cc
pull: add `--confirm` flag to confirm before writing changes
Pulkit Goyal <7895pulkit@gmail.com>
parents:
35612
diff
changeset
|
60 new changesets 8c900227dd5d:00cfe9073916 |
bd7b2c8d06cc
pull: add `--confirm` flag to confirm before writing changes
Pulkit Goyal <7895pulkit@gmail.com>
parents:
35612
diff
changeset
|
61 accept incoming changes (yn)? n |
bd7b2c8d06cc
pull: add `--confirm` flag to confirm before writing changes
Pulkit Goyal <7895pulkit@gmail.com>
parents:
35612
diff
changeset
|
62 transaction abort! |
bd7b2c8d06cc
pull: add `--confirm` flag to confirm before writing changes
Pulkit Goyal <7895pulkit@gmail.com>
parents:
35612
diff
changeset
|
63 rollback completed |
bd7b2c8d06cc
pull: add `--confirm` flag to confirm before writing changes
Pulkit Goyal <7895pulkit@gmail.com>
parents:
35612
diff
changeset
|
64 abort: user aborted |
bd7b2c8d06cc
pull: add `--confirm` flag to confirm before writing changes
Pulkit Goyal <7895pulkit@gmail.com>
parents:
35612
diff
changeset
|
65 [255] |
bd7b2c8d06cc
pull: add `--confirm` flag to confirm before writing changes
Pulkit Goyal <7895pulkit@gmail.com>
parents:
35612
diff
changeset
|
66 $ hg pull --config pull.confirm=true << EOF |
bd7b2c8d06cc
pull: add `--confirm` flag to confirm before writing changes
Pulkit Goyal <7895pulkit@gmail.com>
parents:
35612
diff
changeset
|
67 > n |
bd7b2c8d06cc
pull: add `--confirm` flag to confirm before writing changes
Pulkit Goyal <7895pulkit@gmail.com>
parents:
35612
diff
changeset
|
68 > EOF |
bd7b2c8d06cc
pull: add `--confirm` flag to confirm before writing changes
Pulkit Goyal <7895pulkit@gmail.com>
parents:
35612
diff
changeset
|
69 pulling from $TESTTMP/repo2 |
bd7b2c8d06cc
pull: add `--confirm` flag to confirm before writing changes
Pulkit Goyal <7895pulkit@gmail.com>
parents:
35612
diff
changeset
|
70 searching for changes |
bd7b2c8d06cc
pull: add `--confirm` flag to confirm before writing changes
Pulkit Goyal <7895pulkit@gmail.com>
parents:
35612
diff
changeset
|
71 adding changesets |
bd7b2c8d06cc
pull: add `--confirm` flag to confirm before writing changes
Pulkit Goyal <7895pulkit@gmail.com>
parents:
35612
diff
changeset
|
72 adding manifests |
bd7b2c8d06cc
pull: add `--confirm` flag to confirm before writing changes
Pulkit Goyal <7895pulkit@gmail.com>
parents:
35612
diff
changeset
|
73 adding file changes |
bd7b2c8d06cc
pull: add `--confirm` flag to confirm before writing changes
Pulkit Goyal <7895pulkit@gmail.com>
parents:
35612
diff
changeset
|
74 adding 2 changesets with 1 changes to 1 files |
bd7b2c8d06cc
pull: add `--confirm` flag to confirm before writing changes
Pulkit Goyal <7895pulkit@gmail.com>
parents:
35612
diff
changeset
|
75 new changesets 8c900227dd5d:00cfe9073916 |
bd7b2c8d06cc
pull: add `--confirm` flag to confirm before writing changes
Pulkit Goyal <7895pulkit@gmail.com>
parents:
35612
diff
changeset
|
76 accept incoming changes (yn)? n |
bd7b2c8d06cc
pull: add `--confirm` flag to confirm before writing changes
Pulkit Goyal <7895pulkit@gmail.com>
parents:
35612
diff
changeset
|
77 transaction abort! |
bd7b2c8d06cc
pull: add `--confirm` flag to confirm before writing changes
Pulkit Goyal <7895pulkit@gmail.com>
parents:
35612
diff
changeset
|
78 rollback completed |
bd7b2c8d06cc
pull: add `--confirm` flag to confirm before writing changes
Pulkit Goyal <7895pulkit@gmail.com>
parents:
35612
diff
changeset
|
79 abort: user aborted |
bd7b2c8d06cc
pull: add `--confirm` flag to confirm before writing changes
Pulkit Goyal <7895pulkit@gmail.com>
parents:
35612
diff
changeset
|
80 [255] |
bd7b2c8d06cc
pull: add `--confirm` flag to confirm before writing changes
Pulkit Goyal <7895pulkit@gmail.com>
parents:
35612
diff
changeset
|
81 $ hg pull --confirm << EOF |
bd7b2c8d06cc
pull: add `--confirm` flag to confirm before writing changes
Pulkit Goyal <7895pulkit@gmail.com>
parents:
35612
diff
changeset
|
82 > y |
bd7b2c8d06cc
pull: add `--confirm` flag to confirm before writing changes
Pulkit Goyal <7895pulkit@gmail.com>
parents:
35612
diff
changeset
|
83 > EOF |
bd7b2c8d06cc
pull: add `--confirm` flag to confirm before writing changes
Pulkit Goyal <7895pulkit@gmail.com>
parents:
35612
diff
changeset
|
84 pulling from $TESTTMP/repo2 |
bd7b2c8d06cc
pull: add `--confirm` flag to confirm before writing changes
Pulkit Goyal <7895pulkit@gmail.com>
parents:
35612
diff
changeset
|
85 searching for changes |
bd7b2c8d06cc
pull: add `--confirm` flag to confirm before writing changes
Pulkit Goyal <7895pulkit@gmail.com>
parents:
35612
diff
changeset
|
86 adding changesets |
bd7b2c8d06cc
pull: add `--confirm` flag to confirm before writing changes
Pulkit Goyal <7895pulkit@gmail.com>
parents:
35612
diff
changeset
|
87 adding manifests |
bd7b2c8d06cc
pull: add `--confirm` flag to confirm before writing changes
Pulkit Goyal <7895pulkit@gmail.com>
parents:
35612
diff
changeset
|
88 adding file changes |
bd7b2c8d06cc
pull: add `--confirm` flag to confirm before writing changes
Pulkit Goyal <7895pulkit@gmail.com>
parents:
35612
diff
changeset
|
89 adding 2 changesets with 1 changes to 1 files |
bd7b2c8d06cc
pull: add `--confirm` flag to confirm before writing changes
Pulkit Goyal <7895pulkit@gmail.com>
parents:
35612
diff
changeset
|
90 new changesets 8c900227dd5d:00cfe9073916 |
bd7b2c8d06cc
pull: add `--confirm` flag to confirm before writing changes
Pulkit Goyal <7895pulkit@gmail.com>
parents:
35612
diff
changeset
|
91 accept incoming changes (yn)? y |
14036
90d997a812dc
changegroup: do not count closed new heads (issue2697)
Adrian Buehlmann <adrian@cadifra.com>
parents:
13446
diff
changeset
|
92 added 2 changesets with 1 changes to 1 files |
34661
eb586ed5d8ce
transaction-summary: show the range of new revisions upon pull/unbundle (BC)
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
28549
diff
changeset
|
93 new changesets 8c900227dd5d:00cfe9073916 |
14036
90d997a812dc
changegroup: do not count closed new heads (issue2697)
Adrian Buehlmann <adrian@cadifra.com>
parents:
13446
diff
changeset
|
94 (run 'hg update' to get a working copy) |
90d997a812dc
changegroup: do not count closed new heads (issue2697)
Adrian Buehlmann <adrian@cadifra.com>
parents:
13446
diff
changeset
|
95 $ hg heads -q --closed |
14162
301725c3df9a
localrepo: reuse parent manifest in commitctx if no files have changed
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14036
diff
changeset
|
96 4:00cfe9073916 |
14036
90d997a812dc
changegroup: do not count closed new heads (issue2697)
Adrian Buehlmann <adrian@cadifra.com>
parents:
13446
diff
changeset
|
97 2:effea6de0384 |
90d997a812dc
changegroup: do not count closed new heads (issue2697)
Adrian Buehlmann <adrian@cadifra.com>
parents:
13446
diff
changeset
|
98 1:ed1b79f46b9a |
90d997a812dc
changegroup: do not count closed new heads (issue2697)
Adrian Buehlmann <adrian@cadifra.com>
parents:
13446
diff
changeset
|
99 |
44545
bd7b2c8d06cc
pull: add `--confirm` flag to confirm before writing changes
Pulkit Goyal <7895pulkit@gmail.com>
parents:
35612
diff
changeset
|
100 pull--confirm config option should be ignored if HGPLAIN is set |
bd7b2c8d06cc
pull: add `--confirm` flag to confirm before writing changes
Pulkit Goyal <7895pulkit@gmail.com>
parents:
35612
diff
changeset
|
101 $ HGPLAIN=1 hg pull --config pull.confirm=True |
bd7b2c8d06cc
pull: add `--confirm` flag to confirm before writing changes
Pulkit Goyal <7895pulkit@gmail.com>
parents:
35612
diff
changeset
|
102 pulling from $TESTTMP/repo2 |
bd7b2c8d06cc
pull: add `--confirm` flag to confirm before writing changes
Pulkit Goyal <7895pulkit@gmail.com>
parents:
35612
diff
changeset
|
103 searching for changes |
bd7b2c8d06cc
pull: add `--confirm` flag to confirm before writing changes
Pulkit Goyal <7895pulkit@gmail.com>
parents:
35612
diff
changeset
|
104 no changes found |
bd7b2c8d06cc
pull: add `--confirm` flag to confirm before writing changes
Pulkit Goyal <7895pulkit@gmail.com>
parents:
35612
diff
changeset
|
105 |
14036
90d997a812dc
changegroup: do not count closed new heads (issue2697)
Adrian Buehlmann <adrian@cadifra.com>
parents:
13446
diff
changeset
|
106 $ cd .. |
90d997a812dc
changegroup: do not count closed new heads (issue2697)
Adrian Buehlmann <adrian@cadifra.com>
parents:
13446
diff
changeset
|
107 |
12279 | 108 $ hg init copy |
109 $ cd copy | |
110 | |
111 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
|
112 |
12279 | 113 $ hg pull -qr missing ../repo |
45906
95c4cca641f6
errors: remove trailing "!" from some error messages for consistency
Martin von Zweigbergk <martinvonz@google.com>
parents:
44545
diff
changeset
|
114 abort: unknown revision 'missing' |
12316
4134686b83e1
tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents:
12279
diff
changeset
|
115 [255] |
12279 | 116 |
117 Pull multiple revisions with update: | |
6405
b8346ae5d64b
commands: fix shadowed repo module
Patrick Mezard <pmezard@gmail.com>
parents:
5221
diff
changeset
|
118 |
12279 | 119 $ hg pull -qu -r 0 -r 1 ../repo |
120 $ hg -q parents | |
121 0:bbd179dfa0a7 | |
122 $ hg rollback | |
13446
1e497df514e2
rollback: clarifies the message about the reverted state (issue2628)
Gilles Moris <gilles.moris@free.fr>
parents:
12316
diff
changeset
|
123 repository tip rolled back to revision -1 (undo pull) |
1e497df514e2
rollback: clarifies the message about the reverted state (issue2628)
Gilles Moris <gilles.moris@free.fr>
parents:
12316
diff
changeset
|
124 working directory now based on revision -1 |
10358
d42821cd5c96
pull: with -u and -r, update to the first revision given
Sune Foldager <cryo@cyanite.org>
parents:
8167
diff
changeset
|
125 |
12279 | 126 $ hg pull -qr 0 ../repo |
127 $ hg log | |
128 changeset: 0:bbd179dfa0a7 | |
129 tag: tip | |
130 user: test | |
131 date: Thu Jan 01 00:00:00 1970 +0000 | |
132 summary: add foo | |
133 | |
134 $ hg pull -qr 1 ../repo | |
135 $ hg log | |
136 changeset: 1:ed1b79f46b9a | |
137 tag: tip | |
138 user: test | |
139 date: Thu Jan 01 00:00:00 1970 +0000 | |
140 summary: change foo | |
141 | |
142 changeset: 0:bbd179dfa0a7 | |
143 user: test | |
144 date: Thu Jan 01 00:00:00 1970 +0000 | |
145 summary: add foo | |
146 | |
5221
8ede77c2d008
pull -r: pass the revisions as the heads argument of findincoming
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
147 |
12279 | 148 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
|
149 |
12279 | 150 $ hg pull -qr 1 ../repo |
151 | |
25425
9263f86b9681
pull: avoid race condition with 'hg pull --rev name --update' (issue4706)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
16913
diff
changeset
|
152 Test race condition with -r and -U (issue4707) |
9263f86b9681
pull: avoid race condition with 'hg pull --rev name --update' (issue4706)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
16913
diff
changeset
|
153 |
9263f86b9681
pull: avoid race condition with 'hg pull --rev name --update' (issue4706)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
16913
diff
changeset
|
154 We pull '-U -r <name>' and the name change right after/during the changegroup emission. |
9263f86b9681
pull: avoid race condition with 'hg pull --rev name --update' (issue4706)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
16913
diff
changeset
|
155 We use http because http is better is our racy-est option. |
9263f86b9681
pull: avoid race condition with 'hg pull --rev name --update' (issue4706)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
16913
diff
changeset
|
156 |
9263f86b9681
pull: avoid race condition with 'hg pull --rev name --update' (issue4706)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
16913
diff
changeset
|
157 |
9263f86b9681
pull: avoid race condition with 'hg pull --rev name --update' (issue4706)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
16913
diff
changeset
|
158 $ echo babar > ../repo/jungle |
9263f86b9681
pull: avoid race condition with 'hg pull --rev name --update' (issue4706)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
16913
diff
changeset
|
159 $ cat <<EOF > ../repo/.hg/hgrc |
9263f86b9681
pull: avoid race condition with 'hg pull --rev name --update' (issue4706)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
16913
diff
changeset
|
160 > [hooks] |
9263f86b9681
pull: avoid race condition with 'hg pull --rev name --update' (issue4706)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
16913
diff
changeset
|
161 > outgoing.makecommit = hg ci -Am 'racy commit'; echo committed in pull-race |
9263f86b9681
pull: avoid race condition with 'hg pull --rev name --update' (issue4706)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
16913
diff
changeset
|
162 > EOF |
28549 | 163 $ hg serve -R ../repo -p $HGPORT2 -d --pid-file=../repo.pid |
25425
9263f86b9681
pull: avoid race condition with 'hg pull --rev name --update' (issue4706)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
16913
diff
changeset
|
164 $ cat ../repo.pid >> $DAEMON_PIDS |
9263f86b9681
pull: avoid race condition with 'hg pull --rev name --update' (issue4706)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
16913
diff
changeset
|
165 $ hg pull --rev default --update http://localhost:$HGPORT2/ |
9263f86b9681
pull: avoid race condition with 'hg pull --rev name --update' (issue4706)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
16913
diff
changeset
|
166 pulling from http://localhost:$HGPORT2/ |
9263f86b9681
pull: avoid race condition with 'hg pull --rev name --update' (issue4706)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
16913
diff
changeset
|
167 searching for changes |
9263f86b9681
pull: avoid race condition with 'hg pull --rev name --update' (issue4706)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
16913
diff
changeset
|
168 adding changesets |
9263f86b9681
pull: avoid race condition with 'hg pull --rev name --update' (issue4706)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
16913
diff
changeset
|
169 adding manifests |
9263f86b9681
pull: avoid race condition with 'hg pull --rev name --update' (issue4706)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
16913
diff
changeset
|
170 adding file changes |
9263f86b9681
pull: avoid race condition with 'hg pull --rev name --update' (issue4706)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
16913
diff
changeset
|
171 added 1 changesets with 1 changes to 1 files (+1 heads) |
34661
eb586ed5d8ce
transaction-summary: show the range of new revisions upon pull/unbundle (BC)
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
28549
diff
changeset
|
172 new changesets effea6de0384 |
25425
9263f86b9681
pull: avoid race condition with 'hg pull --rev name --update' (issue4706)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
16913
diff
changeset
|
173 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
9263f86b9681
pull: avoid race condition with 'hg pull --rev name --update' (issue4706)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
16913
diff
changeset
|
174 $ hg log -G |
9263f86b9681
pull: avoid race condition with 'hg pull --rev name --update' (issue4706)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
16913
diff
changeset
|
175 @ changeset: 2:effea6de0384 |
9263f86b9681
pull: avoid race condition with 'hg pull --rev name --update' (issue4706)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
16913
diff
changeset
|
176 | tag: tip |
9263f86b9681
pull: avoid race condition with 'hg pull --rev name --update' (issue4706)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
16913
diff
changeset
|
177 | parent: 0:bbd179dfa0a7 |
9263f86b9681
pull: avoid race condition with 'hg pull --rev name --update' (issue4706)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
16913
diff
changeset
|
178 | user: test |
9263f86b9681
pull: avoid race condition with 'hg pull --rev name --update' (issue4706)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
16913
diff
changeset
|
179 | date: Thu Jan 01 00:00:00 1970 +0000 |
9263f86b9681
pull: avoid race condition with 'hg pull --rev name --update' (issue4706)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
16913
diff
changeset
|
180 | summary: add bar |
9263f86b9681
pull: avoid race condition with 'hg pull --rev name --update' (issue4706)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
16913
diff
changeset
|
181 | |
9263f86b9681
pull: avoid race condition with 'hg pull --rev name --update' (issue4706)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
16913
diff
changeset
|
182 | o changeset: 1:ed1b79f46b9a |
9263f86b9681
pull: avoid race condition with 'hg pull --rev name --update' (issue4706)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
16913
diff
changeset
|
183 |/ user: test |
9263f86b9681
pull: avoid race condition with 'hg pull --rev name --update' (issue4706)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
16913
diff
changeset
|
184 | date: Thu Jan 01 00:00:00 1970 +0000 |
9263f86b9681
pull: avoid race condition with 'hg pull --rev name --update' (issue4706)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
16913
diff
changeset
|
185 | summary: change foo |
9263f86b9681
pull: avoid race condition with 'hg pull --rev name --update' (issue4706)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
16913
diff
changeset
|
186 | |
9263f86b9681
pull: avoid race condition with 'hg pull --rev name --update' (issue4706)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
16913
diff
changeset
|
187 o changeset: 0:bbd179dfa0a7 |
9263f86b9681
pull: avoid race condition with 'hg pull --rev name --update' (issue4706)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
16913
diff
changeset
|
188 user: test |
9263f86b9681
pull: avoid race condition with 'hg pull --rev name --update' (issue4706)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
16913
diff
changeset
|
189 date: Thu Jan 01 00:00:00 1970 +0000 |
9263f86b9681
pull: avoid race condition with 'hg pull --rev name --update' (issue4706)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
16913
diff
changeset
|
190 summary: add foo |
9263f86b9681
pull: avoid race condition with 'hg pull --rev name --update' (issue4706)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
16913
diff
changeset
|
191 |
9263f86b9681
pull: avoid race condition with 'hg pull --rev name --update' (issue4706)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
16913
diff
changeset
|
192 |
16913
f2719b387380
tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents:
16107
diff
changeset
|
193 $ cd .. |
35612
edf52be98978
test-pull-r: explicitly kill server processes
Joerg Sonnenberger <joerg@bec.de>
parents:
35393
diff
changeset
|
194 $ killdaemons.py |