Mercurial > hg
view contrib/tcsh_completion @ 22285:85bded43cc80
largefiles: restore standins according to restored dirstate
Before this patch, standins are restored from the NEW parent of the
working directory at "hg rollback", and this causes:
- standins removed in the rollback-ed revision are restored, and
become orphan, because they are already marked as "R" in the
restored dirstate and expected to be unlinked
- standins added in the rollback-ed revision are left as they were
before rollback, because they are not included in the new parent
(this may not be so serious)
This patch replaces the "merge.update" invocation with a specific
implementation to restore standins according to restored dirstate.
This is also the preparation to centralize the logic of updating
largefiles into the function wrapping "merge.update" in the subsequent
patch.
After that patch, "merge.update" will also update largefiles in the
working directory and be redundant for restoring standins only.
author | FUJIWARA Katsunori <foozy@lares.dti.ne.jp> |
---|---|
date | Sun, 24 Aug 2014 23:47:25 +0900 |
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)/'