D6561: copies: simplify merging of copy dicts on merge commits

martinvonz added a comment. In D6561#95834 , @yuja wrote: >> while work: >> >> - r, i1, copies1 = heapq.heappop(work) >> >> +r, i1, copies = heapq.heappop(work) >> >> if work and work[0][0] == r: >> # We are

D6561: copies: simplify merging of copy dicts on merge commits

yuja added a comment. > while work: > > - r, i1, copies1 = heapq.heappop(work) > > +r, i1, copies = heapq.heappop(work) > > if work and work[0][0] == r: > # We are tracing copies from both parents > r, i2, copies2 = heapq.heappop(work) > > - copies =

Re: D6561: copies: simplify merging of copy dicts on merge commits

> while work: > -r, i1, copies1 = heapq.heappop(work) > +r, i1, copies = heapq.heappop(work) > if work and work[0][0] == r: > # We are tracing copies from both parents > r, i2, copies2 = heapq.heappop(work) > -copies = {} > -

D6561: copies: simplify merging of copy dicts on merge commits

Closed by commit rHG907cef396635: copies: simplify merging of copy dicts on merge commits (authored by martinvonz). This revision was automatically updated to reflect the committed changes. This revision was not accepted when it landed; it landed in state "Needs Review". REPOSITORY rHG

D6561: copies: simplify merging of copy dicts on merge commits

martinvonz created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY After we removed some filtering in 35d674a3d5db (copies: don't filter out copy