Mercurial > hg
view mercurial/help/deprecated.txt @ 39224:5e52b6da9c0c
tests: demonstrate a problem with renames on the p2 side of a conversion
I think this is related to the octopus merge being sloppy, and that's having a
cascading affect on the fixup merge. If this change is made on p1 (specifically
with the 'Added parent file' commit), the failure doesn't occur.
The file modification with the rename doesn't seem to be necessary, but it's
what's happening in a production repo where I first noticed, so I left it. This
is an example of the manifest divergence I'd been seeing, which wasn't fixed by
Yuya's recent changes. This is separate from the changelog divergence I was
also seeing[1]. Probably nobody cares about bzr anymore, but this will also
affect git, since the octopus fixup code is in the hg sink.
[1] https://www.mercurial-scm.org/pipermail/mercurial-devel/2018-August/120473.html
author | Matt Harbison <matt_harbison@yahoo.com> |
---|---|
date | Mon, 20 Aug 2018 16:19:36 -0400 |
parents | 5fa4e29ba3e3 |
children |
line wrap: on
line source
Mercurial evolves over time, some features, options, commands may be replaced by better and more secure alternatives. This topic will help you migrating your existing usage and/or configuration to newer features. Commands ======== The following commands are still available but their use are not recommended: ``locate`` This command has been replaced by `hg files`. ``parents`` This command can be replaced by `hg summary` or `hg log` with appropriate revsets. See `hg help revsets` for more information. ``tip`` The recommended alternative is `hg heads`. Options ======= ``web.allowpull`` Renamed to `allow-pull`. ``web.allow_push`` Renamed to `allow-push`.