##// END OF EJS Templates
discovery: weaken claim about returned common heads if ancestorsof are given...
Manuel Jacob -
r45702:75f6491b default
parent child Browse files
Show More
@@ -41,8 +41,8 def findcommonincoming(repo, remote, hea
41 any longer.
41 any longer.
42 "heads" is either the supplied heads, or else the remote's heads.
42 "heads" is either the supplied heads, or else the remote's heads.
43 "ancestorsof" if not None, restrict the discovery to a subset defined by
43 "ancestorsof" if not None, restrict the discovery to a subset defined by
44 these nodes. Changeset outside of this set won't be considered (and
44 these nodes. Changeset outside of this set won't be considered (but may
45 won't appears in "common")
45 still appear in "common").
46
46
47 If you pass heads and they are all known locally, the response lists just
47 If you pass heads and they are all known locally, the response lists just
48 these heads in "common" and in "heads".
48 these heads in "common" and in "heads".
@@ -1112,3 +1112,40 fixed in 86c35b7ae300:
1112 * @5d0b986a083e0d91f116de4691e2aaa54d5bbec0 (*)> found 101 common and 1 unknown server heads, 1 roundtrips in *.????s (glob)
1112 * @5d0b986a083e0d91f116de4691e2aaa54d5bbec0 (*)> found 101 common and 1 unknown server heads, 1 roundtrips in *.????s (glob)
1113 * @5d0b986a083e0d91f116de4691e2aaa54d5bbec0 (*)> -R r1 outgoing r2 *-T{rev} * --config *extensions.blackbox=* exited 0 after *.?? seconds (glob)
1113 * @5d0b986a083e0d91f116de4691e2aaa54d5bbec0 (*)> -R r1 outgoing r2 *-T{rev} * --config *extensions.blackbox=* exited 0 after *.?? seconds (glob)
1114 $ cd ..
1114 $ cd ..
1115
1116 Even if the set of revs to discover is restricted, unrelated revs may be
1117 returned as common heads.
1118
1119 $ mkdir ancestorsof
1120 $ cd ancestorsof
1121 $ hg init a
1122 $ hg clone a b -q
1123 $ cd b
1124 $ hg debugbuilddag '.:root *root *root'
1125 $ hg log -G -T '{node|short}'
1126 o fa942426a6fd
1127 |
1128 | o 66f7d451a68b
1129 |/
1130 o 1ea73414a91b
1131
1132 $ hg push -r 66f7d451a68b -q
1133 $ hg debugdiscovery --verbose --rev fa942426a6fd
1134 comparing with $TESTTMP/ancestorsof/a
1135 searching for changes
1136 elapsed time: * seconds (glob)
1137 heads summary:
1138 total common heads: 1
1139 also local heads: 1
1140 also remote heads: 1
1141 both: 1
1142 local heads: 2
1143 common: 1
1144 missing: 1
1145 remote heads: 1
1146 common: 1
1147 unknown: 0
1148 local changesets: 3
1149 common: 2
1150 missing: 1
1151 common heads: 66f7d451a68b
General Comments 0
You need to be logged in to leave comments. Login now