|
|
|
|
|
by mrb
5262 days ago
|
|
But the moment you need any kind of advanced functionality, such as say, something unimaginable like rebasing a Mercurial Queue against an upstream change that conflicts, you are suddenly dealing with tools that are no more advanced than diff and patch This is incorrect. "hg rebase" is more advanced and smarter than diff and patch. Also, people arguing against Mercurial seem unaware of "hg collapse" which allows rewriting history in a way similar to git. (However I would probably not use hg rebase on Mercurial queues, which are meant to be managed by mq extension commands.) I think most of the git vs. mercurial debates are non-productive because proponents of one tool don't know the other tool well enough to argue against it. |
|
You completely contradicted your own claim already.
This is exactly what I'm complaining about: Mercurial Queues are diff and patch. And you need Mercurial Queues for decent Mercurial workflows.
I think most of the git vs. mercurial debates are non-productive because proponents of one tool don't know the other tool well enough to argue against it.
I use Mercurial extensively and on a daily basis, so I think I'm qualified to talk about it. People who claim the complaint is invalid should do Mercurial users a favor and point out a workflow that avoids the issue. I'm still waiting (and manually merging all my patch queues whenever I get a conflict in a topmost patch).