Mercurial > hg
view contrib/tcsh_completion @ 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 | 2616325766e3 |
children |
line wrap: on
line source
# # tcsh completion for Mercurial # # This file has been auto-generated by tcsh_completion_build.sh for # Mercurial Distributed SCM (version 1.7.5+157-8a220ae0b2ba) # # Copyright (C) 2005 TK Soh. # # This is free software; you can redistribute it and/or modify it under # the terms of the GNU General Public License as published by the Free # Software Foundation; either version 2 of the License, or (at your # option) any later version. # complete hg \ 'n/--cwd/d/' 'n/-R/d/' 'n/--repository/d/' \ 'C/-/( -R --repository \ --cwd \ -y --noninteractive \ -q --quiet \ -v --verbose \ --config \ --debug \ --debugger \ --encoding \ --encodingmode \ --traceback \ --time \ --profile \ --version \ -h --help)/' \ 'p/1/(add addremove annotate blame archive \ backout bisect bookmarks branch branches \ bundle cat clone commit ci \ copy cp debugancestor debugbuilddag debugcheckstate \ debugcommands debugcomplete debugdag debugdata debugdate \ debugfsinfo debugignore debugindex debugindexdot debuginstall \ debugpushkey debugrebuildstate debugrename debugrevspec debugsetparents \ debugstate debugsub debugwalk diff export \ forget grep heads help identify \ id import patch incoming in \ init locate log history manifest \ merge outgoing out parents paths \ pull push recover remove rm \ rename move mv resolve revert \ rollback root serve showconfig debugconfig \ status st summary sum tag \ tags tip unbundle update up \ checkout co verify version)/'