[PATCH] subrepo: add full revert support for git subrepos

[Mathias De Maré]

On Mon, Dec 29, 2014 at 11:41 PM, Matt Mackall <mpm at selenic.com> wrote:

> On Sun, 2014-12-28 at 10:50 +0100, Mathias De Maré wrote:
> > # HG changeset patch
> > # User Mathias De Maré <mathias.demare at gmail.com>
> > # Date 1419759745 -3600
> > #      Son Dez 28 10:42:25 2014 +0100
> > # Node ID 092bb321b2adc00ef207ffb15fcd7446203806e9
> > # Parent  67d63ec85eb72187508692e52f14be46101707a5
> > subrepo: add full revert support for git subrepos
>
> FYI, I'm getting this with git 1.8.1:
>
> --- /home/mpm/hg-test-/tests/test-subrepo-git.t
> +++ /home/mpm/hg-test-/tests/test-subrepo-git.t.err
> @@ -790,7 +790,6 @@
>
>    $ hg status --subrepos
>    ? s/barfoo
> -  ? s/foobar.orig
>
>    $ mv s/foobar.orig s/foobar
>
> Works on another machine with 1.8.4.
>

I just compiled 1.8.1 on my machine, it seems to work without issue here.
I'm wondering if this may be related to configuration, rather than git
version.
Do you have any global gitignore pattern?
If you have a global git configuration in /etc/gitconfig, it could contain
an 'excludesfile' reference, which in turn contains something like '*.orig'.
An other possibility is ~/.config/git/ignore.

Greetings,
Mathias
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://selenic.com/pipermail/mercurial-devel/attachments/20141230/3a002324/attachment.html>