This is an archive of the discontinued Mercurial Phabricator instance.

diff: graduate merge diffs from experimental and add to tweakdefaults
Needs RevisionPublic

Authored by durin42 on Wed, May 4, 12:19 PM.

Details

Reviewers
martinvonz
Group Reviewers
hg-reviewers
Summary

I've been using this functionality for two years without incident and
it's been outstanding. In my opinion it's time to both remove the
experimental warning label and move this straight into tweakdefaults.

Diff Detail

Repository
rHG Mercurial
Branch
default
Lint
No Linters Available
Unit
No Unit Test Coverage

Event Timeline

durin42 created this revision.Wed, May 4, 12:19 PM
martinvonz requested changes to this revision.Wed, May 4, 12:37 PM
martinvonz added a subscriber: martinvonz.

I agree, except that I've seen it crash sometimes. I wrote a little script to find such cases now. Here's an example: hg diff --change 7c2921a6. So we need to fix that first. Sorry I never bothered to report a bug for it.

This revision now requires changes to proceed.Wed, May 4, 12:37 PM

I agree, except that I've seen it crash sometimes. I wrote a little script to find such cases now. Here's an example: hg diff --change 7c2921a6. So we need to fix that first. Sorry I never bothered to report a bug for it.

That doesn't crash for me! Even HGRCPATH=/dev/null hg diff --change 7c2921a6 --config diff.merge=1 works...can you try and figure out why you're seeing a crash?

Do we still have the problem of not being able to individually disable options enabled by tweakdefaults? I think there was a bug about it that probably got auto-closed.

I agree, except that I've seen it crash sometimes. I wrote a little script to find such cases now. Here's an example: hg diff --change 7c2921a6. So we need to fix that first. Sorry I never bothered to report a bug for it.

That doesn't crash for me! Even HGRCPATH=/dev/null hg diff --change 7c2921a6 --config diff.merge=1 works...can you try and figure out why you're seeing a crash?

It wasn't easy to find, but I've finally isolated it to this:

HGRCPATH= hg diff --change 7c2921a6 --config diff.merge=1 --config experimental.copies.read-from=changeset-only