[PATCH 1 of 1 v2] subrepo: make update -C for svn and git subrepos clean the working directory

Eric Eisner ede at mit.edu
Tue Jan 18 10:55:41 CST 2011


On Tue, Jan 18, 2011 at 05:28, Erik Zielke <ez at aragost.com> wrote:

> # HG changeset patch
> # User Erik Zielke <ez at aragost.com>
> # Date 1295345793 -3600
> # Node ID b383c2eef8c942bdefcc9f3f08988d68fa5fbdcd
> # Parent  0190442fe5e2dd2745f6fe2d845bfcc7e999c83e
> subrepo: make update -C for svn and git subrepos clean the working
> directory
>


>             return
>         branch2rev, rev2branch = self._gitbranchmap()
>
> +        def checkout(args):
> +            cmd = ['checkout']
> +            if overwrite:
> +                self._gitcommand(['reset', 'HEAD', '.'])
> +                cmd.append('-f')
> +            self._gitcommand(cmd + args)
> +
>         def rawcheckout():
>             # no branch to checkout, check it out with no branch
>

 There doesn't seem to be any reason to do this reset right before running
checkout with -f. It seems redundant and the tests pass without it.

-Eric Eisner
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://selenic.com/pipermail/mercurial-devel/attachments/20110118/216398c8/attachment.htm>


More information about the Mercurial-devel mailing list