Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Loading…

#579 made some comments outdated #655

Closed
neojski opened this Issue · 4 comments

2 participants

@neojski
Owner

At least:

  • traverseRevTree callback got new parameter
  • rootToLeaf returns ids and opts
@neojski
Owner

Also quite confusing when reading the merge code is when I see doMerge(tree, path, dontExpand) and tree is expected to be array of Paths, that is KeyTree.
I know that these are only internal names and I'm just complaining

@neojski
Owner

More random comments:

  • collectConflicts now needs only rev_tree in order to work so its argument shouldn't be metadata (as it used to as we needed deletions) but rev_tree
  • why do we sort leaves by pos in collectLeaves? I think it's unnecessary. If it is - we should comment why
@daleharvey
Owner

I think collectLeaves used to be the base for winningRev, but yeh the sort should probably come out, and yup the rest are things that should have been cleaned up at the time, good catches, I didnt want my last commit to bitrot since it was complicated but will make sure to leave the PR's up long enough to review next time

@neojski neojski was assigned
@daleharvey
Owner

Woops, referred my commit to the issue number in the title instead of the actual issue, but I just removed the comments in

039497a

@daleharvey daleharvey closed this
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Something went wrong with that request. Please try again.