4 ms·

I wonder how mercurial compares in this aspect. Also, I'll keep using git because for sure, it's a helluva lot better than SVN or CVS (which my company was usin

I wonder how mercurial compares in this aspect. Also, I'll keep using git because for sure, it's a helluva lot better than SVN or CVS (which my company was using when I got there).

tonfa 15y ago
Same as git, and you'll probably get the same reactions. """ In other words, we're already at the point of significantly diminished, possibly negative returns on effort. The last few percent will always require some level of human-equivalent intelligence. I think effort here is much better spent elsewhere, like researching general AI or playing on waterslides. """ http://thread.gmane.org/gmane.comp.version-control.mercurial.general/26109/focus=26110 http://thread.gmane.org/gmane.comp.version-control.mercurial...
- anonymoushn 15y ago
  The least we can do is detect a situation like this and make it a conflict.
- etherealG 15y ago
  Thanks so much for this link, this is exactly the kind of analysis I was hoping for. Clearly this is all a bit FUD, and darcs which gets this right, is trying too hard. I wonder how fast the general merge algo that darcs is using to get this right is? <trollface>
  - tonfa 15y ago
    Matt's point is that while some algorithms will fix this particular case, you can still come up with a different edge case which makes it break. The whole "prefect merge tool" was very popular five years ago (during git's and mercurial's infancy), but it didn't lead anywhere. Simple merges strategy are "good enough" in practice.
    - ob 15y ago
      Matt's point is that they've chosen a system that makes it really hard to get that last 10%. "We have tried to draw spirals using cartesian coordinates, what we have gets us 90% there, but there are infinities and edge cases involved in getting a perfect spiral. The equations describing them would get so complicated it's just not worth it." What we have in BitKeeper is the equivalent of polar coordinates... it makes drawing spirals much, much easier ;)
      - tonfa 15y ago
        Do you have a page describing how that would differ? The bk website seems awfully outdated: there's no mention of the existence of other DVCS, there's a quote from MySQL being happy with bk -- they switched to bazaar two years ago --, etc.. I would be nice if you could give some examples where bk gets the merge right while git doesn't.
        ob 15y ago
        Yeah, the website is awfully outdated and information free. BitMover is working on it. One example that bk gets right and git doesn't is precisely the one explained in the article.
      - etherealG 15y ago
        I'd appreciate an explanation of your approach too, it would be great to know how we could "adjust our coordinates" to take care of this issue without loosing speed, but gaining accuracy. I suspect what you'll find is changing the base in this way, while fixing this problem would introduce other problems that occur much more regularly, but I hope I'm wrong.
        ob 15y ago
        You're wrong, but unfortunately I'm not at liberty to describe how bk does merges... it's part of the "secret sauce". i am truley sorry for your lots...

I wonder how mercurial compares in this aspect. Also, I'll keep using git because for sure, it's a helluva lot better than SVN or CVS (which my company was using when I got there).

tonfa 15y ago

Same as git, and you'll probably get the same reactions. """ In other words, we're already at the point of significantly diminished, possibly negative returns on effort. The last few percent will always require some level of human-equivalent intelligence. I think effort here is much better spent elsewhere, like researching general AI or playing on waterslides. """ http://thread.gmane.org/gmane.comp.version-control.mercurial.general/26109/focus=26110 http://thread.gmane.org/gmane.comp.version-control.mercurial...

anonymoushn 15y ago
The least we can do is detect a situation like this and make it a conflict.
etherealG 15y ago
Thanks so much for this link, this is exactly the kind of analysis I was hoping for. Clearly this is all a bit FUD, and darcs which gets this right, is trying too hard. I wonder how fast the general merge algo that darcs is using to get this right is? <trollface>
- tonfa 15y ago
  Matt's point is that while some algorithms will fix this particular case, you can still come up with a different edge case which makes it break. The whole "prefect merge tool" was very popular five years ago (during git's and mercurial's infancy), but it didn't lead anywhere. Simple merges strategy are "good enough" in practice.
  - ob 15y ago
    Matt's point is that they've chosen a system that makes it really hard to get that last 10%. "We have tried to draw spirals using cartesian coordinates, what we have gets us 90% there, but there are infinities and edge cases involved in getting a perfect spiral. The equations describing them would get so complicated it's just not worth it." What we have in BitKeeper is the equivalent of polar coordinates... it makes drawing spirals much, much easier ;)
    - tonfa 15y ago
      Do you have a page describing how that would differ? The bk website seems awfully outdated: there's no mention of the existence of other DVCS, there's a quote from MySQL being happy with bk -- they switched to bazaar two years ago --, etc.. I would be nice if you could give some examples where bk gets the merge right while git doesn't.
      - ob 15y ago
        Yeah, the website is awfully outdated and information free. BitMover is working on it. One example that bk gets right and git doesn't is precisely the one explained in the article.
    - etherealG 15y ago
      I'd appreciate an explanation of your approach too, it would be great to know how we could "adjust our coordinates" to take care of this issue without loosing speed, but gaining accuracy. I suspect what you'll find is changing the base in this way, while fixing this problem would introduce other problems that occur much more regularly, but I hope I'm wrong.
      - ob 15y ago
        You're wrong, but unfortunately I'm not at liberty to describe how bk does merges... it's part of the "secret sauce". i am truley sorry for your lots...