annotate 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
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
37998
5fa4e29ba3e3 help: add new deprecated topic
David Demelier <markand@malikania.fr>
parents:
diff changeset
1 Mercurial evolves over time, some features, options, commands may be replaced by
5fa4e29ba3e3 help: add new deprecated topic
David Demelier <markand@malikania.fr>
parents:
diff changeset
2 better and more secure alternatives. This topic will help you migrating your
5fa4e29ba3e3 help: add new deprecated topic
David Demelier <markand@malikania.fr>
parents:
diff changeset
3 existing usage and/or configuration to newer features.
5fa4e29ba3e3 help: add new deprecated topic
David Demelier <markand@malikania.fr>
parents:
diff changeset
4
5fa4e29ba3e3 help: add new deprecated topic
David Demelier <markand@malikania.fr>
parents:
diff changeset
5 Commands
5fa4e29ba3e3 help: add new deprecated topic
David Demelier <markand@malikania.fr>
parents:
diff changeset
6 ========
5fa4e29ba3e3 help: add new deprecated topic
David Demelier <markand@malikania.fr>
parents:
diff changeset
7
5fa4e29ba3e3 help: add new deprecated topic
David Demelier <markand@malikania.fr>
parents:
diff changeset
8 The following commands are still available but their use are not recommended:
5fa4e29ba3e3 help: add new deprecated topic
David Demelier <markand@malikania.fr>
parents:
diff changeset
9
5fa4e29ba3e3 help: add new deprecated topic
David Demelier <markand@malikania.fr>
parents:
diff changeset
10 ``locate``
5fa4e29ba3e3 help: add new deprecated topic
David Demelier <markand@malikania.fr>
parents:
diff changeset
11
5fa4e29ba3e3 help: add new deprecated topic
David Demelier <markand@malikania.fr>
parents:
diff changeset
12 This command has been replaced by `hg files`.
5fa4e29ba3e3 help: add new deprecated topic
David Demelier <markand@malikania.fr>
parents:
diff changeset
13
5fa4e29ba3e3 help: add new deprecated topic
David Demelier <markand@malikania.fr>
parents:
diff changeset
14 ``parents``
5fa4e29ba3e3 help: add new deprecated topic
David Demelier <markand@malikania.fr>
parents:
diff changeset
15
5fa4e29ba3e3 help: add new deprecated topic
David Demelier <markand@malikania.fr>
parents:
diff changeset
16 This command can be replaced by `hg summary` or `hg log` with appropriate
5fa4e29ba3e3 help: add new deprecated topic
David Demelier <markand@malikania.fr>
parents:
diff changeset
17 revsets. See `hg help revsets` for more information.
5fa4e29ba3e3 help: add new deprecated topic
David Demelier <markand@malikania.fr>
parents:
diff changeset
18
5fa4e29ba3e3 help: add new deprecated topic
David Demelier <markand@malikania.fr>
parents:
diff changeset
19 ``tip``
5fa4e29ba3e3 help: add new deprecated topic
David Demelier <markand@malikania.fr>
parents:
diff changeset
20
5fa4e29ba3e3 help: add new deprecated topic
David Demelier <markand@malikania.fr>
parents:
diff changeset
21 The recommended alternative is `hg heads`.
5fa4e29ba3e3 help: add new deprecated topic
David Demelier <markand@malikania.fr>
parents:
diff changeset
22
5fa4e29ba3e3 help: add new deprecated topic
David Demelier <markand@malikania.fr>
parents:
diff changeset
23 Options
5fa4e29ba3e3 help: add new deprecated topic
David Demelier <markand@malikania.fr>
parents:
diff changeset
24 =======
5fa4e29ba3e3 help: add new deprecated topic
David Demelier <markand@malikania.fr>
parents:
diff changeset
25
5fa4e29ba3e3 help: add new deprecated topic
David Demelier <markand@malikania.fr>
parents:
diff changeset
26 ``web.allowpull``
5fa4e29ba3e3 help: add new deprecated topic
David Demelier <markand@malikania.fr>
parents:
diff changeset
27 Renamed to `allow-pull`.
5fa4e29ba3e3 help: add new deprecated topic
David Demelier <markand@malikania.fr>
parents:
diff changeset
28
5fa4e29ba3e3 help: add new deprecated topic
David Demelier <markand@malikania.fr>
parents:
diff changeset
29 ``web.allow_push``
5fa4e29ba3e3 help: add new deprecated topic
David Demelier <markand@malikania.fr>
parents:
diff changeset
30 Renamed to `allow-push`.