##// END OF EJS Templates
pull -r: pass the revisions as the heads argument of findincoming...
Alexis S. L. Carvalho -
r5221:8ede77c2 default
parent child Browse files
Show More
@@ -0,0 +1,27 b''
1 #!/bin/sh
2
3 hg init repo
4 cd repo
5 echo foo > foo
6 hg ci -qAm 'add foo' -d '0 0'
7 echo >> foo
8 hg ci -m 'change foo' -d '0 0'
9 hg up -qC 0
10 echo bar > bar
11 hg ci -qAm 'add bar' -d '0 0'
12 hg log
13 cd ..
14 hg init copy
15 cd copy
16
17 echo '% pull -r 0'
18 hg pull -qr 0 ../repo
19 hg log
20
21 echo '% pull -r 1'
22 hg pull -qr 1 ../repo
23 hg log
24
25 # this used to abort: received changelog group is empty
26 echo '% pull -r 1 again'
27 hg pull -qr 1 ../repo
@@ -0,0 +1,37 b''
1 changeset: 2:effea6de0384
2 tag: tip
3 parent: 0:bbd179dfa0a7
4 user: test
5 date: Thu Jan 01 00:00:00 1970 +0000
6 summary: add bar
7
8 changeset: 1:ed1b79f46b9a
9 user: test
10 date: Thu Jan 01 00:00:00 1970 +0000
11 summary: change foo
12
13 changeset: 0:bbd179dfa0a7
14 user: test
15 date: Thu Jan 01 00:00:00 1970 +0000
16 summary: add foo
17
18 % pull -r 0
19 changeset: 0:bbd179dfa0a7
20 tag: tip
21 user: test
22 date: Thu Jan 01 00:00:00 1970 +0000
23 summary: add foo
24
25 % pull -r 1
26 changeset: 1:ed1b79f46b9a
27 tag: tip
28 user: test
29 date: Thu Jan 01 00:00:00 1970 +0000
30 summary: change foo
31
32 changeset: 0:bbd179dfa0a7
33 user: test
34 date: Thu Jan 01 00:00:00 1970 +0000
35 summary: add foo
36
37 % pull -r 1 again
@@ -1312,7 +1312,7 b' class localrepository(repo.repository):'
1312 mylock = True
1312 mylock = True
1313
1313
1314 try:
1314 try:
1315 fetch = self.findincoming(remote, force=force)
1315 fetch = self.findincoming(remote, heads=heads, force=force)
1316 if fetch == [nullid]:
1316 if fetch == [nullid]:
1317 self.ui.status(_("requesting all changes\n"))
1317 self.ui.status(_("requesting all changes\n"))
1318
1318
General Comments 0
You need to be logged in to leave comments. Login now