Show More
@@ -473,7 +473,9 b' class localrepository(repo.repository):' | |||||
473 | latest = newnodes.pop() |
|
473 | latest = newnodes.pop() | |
474 | if latest not in bheads: |
|
474 | if latest not in bheads: | |
475 | continue |
|
475 | continue | |
476 |
reachable = se |
|
476 | reachable = set() | |
|
477 | for bh in bheads: | |||
|
478 | reachable |= self.changelog.reachable(latest, bh) | |||
477 | bheads = [b for b in bheads if b not in reachable] |
|
479 | bheads = [b for b in bheads if b not in reachable] | |
478 | newbheads.insert(0, latest) |
|
480 | newbheads.insert(0, latest) | |
479 | bheads.extend(newbheads) |
|
481 | bheads.extend(newbheads) |
@@ -185,6 +185,18 b' echo % fetch should succeed' | |||||
185 | hg --cwd ib2 fetch ../ib1 |
|
185 | hg --cwd ib2 fetch ../ib1 | |
186 | rm -fr ib1 ib2 |
|
186 | rm -fr ib1 ib2 | |
187 |
|
187 | |||
|
188 | echo % test issue1726 | |||
|
189 | hg init i1726r1 | |||
|
190 | echo a > i1726r1/a | |||
|
191 | hg --cwd i1726r1 ci -Am base | |||
|
192 | hg clone i1726r1 i1726r2 | |||
|
193 | echo b > i1726r1/a | |||
|
194 | hg --cwd i1726r1 ci -m second | |||
|
195 | echo c > i1726r2/a | |||
|
196 | hg --cwd i1726r2 ci -m third | |||
|
197 | HGMERGE=true hg --cwd i1726r2 fetch ../i1726r1 | sed 's/new changeset 3:[0-9a-zA-Z]\+/new changeset 3/' | |||
|
198 | hg --cwd i1726r2 heads default --template '{rev}\n' | |||
|
199 | ||||
188 | "$TESTDIR/killdaemons.py" |
|
200 | "$TESTDIR/killdaemons.py" | |
189 |
|
201 | |||
190 | true |
|
202 | true |
@@ -190,3 +190,20 b' 3 files updated, 0 files merged, 0 files' | |||||
190 | pulling from ../ib1 |
|
190 | pulling from ../ib1 | |
191 | searching for changes |
|
191 | searching for changes | |
192 | no changes found |
|
192 | no changes found | |
|
193 | % test issue1726 | |||
|
194 | adding a | |||
|
195 | updating working directory | |||
|
196 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |||
|
197 | pulling from ../i1726r1 | |||
|
198 | searching for changes | |||
|
199 | adding changesets | |||
|
200 | adding manifests | |||
|
201 | adding file changes | |||
|
202 | added 1 changesets with 1 changes to 1 files (+1 heads) | |||
|
203 | updating to 2:7837755a2789 | |||
|
204 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |||
|
205 | merging with 1:d1f0c6c48ebd | |||
|
206 | merging a | |||
|
207 | 0 files updated, 1 files merged, 0 files removed, 0 files unresolved | |||
|
208 | new changeset 3 merges remote changes with local | |||
|
209 | 3 |
General Comments 0
You need to be logged in to leave comments.
Login now