[PATCH stable] tests: ignore git's output in test-subrepo-git.t

[Kevin Bullock]

On Mar 15, 2012, at 6:06 PM, Javi Merino wrote:

> # HG changeset patch
> # User Javi Merino <cibervicho at gmail.com>
> # Date 1331852551 0
> # Branch stable
> # Node ID 0628290d98dfbbe59d16751486340c0591e7c8d2
> # Parent  594fc9329628df58da2854e11eea078af0b4750f
> tests: ignore git's output in test-subrepo-git.t
> 
> git version 1.7.9.1 makes the testsuite fail with:
> 
> @@ -482,7 +482,17 @@

Part of your patch seems to have gotten munched? There should be three lines preceding this start-of-hunk that look like:

diff --git a/... b/...
--- a/...
+++ b/...

Also, what the heck is up with that Reply-To: address?

pacem in terris / мир / शान्ति / ‎‫سَلاَم‬ / 平和
Kevin R. Bullock

> 
> Sticky repository, update --clean
>   $ hg update --clean tip
> -  Previous HEAD position was aa84837... f
> +  Warning: you are leaving 2 commits behind, not connected to
> +  any of your branches:
> +
> +    aa84837 f
> +    126f2a1 gg
> +
> +  If you want to keep them by creating a new branch, this may be a good time
> +  to do so with:
> +
> +   git branch new_branch_name aa84837ccfbdfedcdcdeeedc309d73e6eb069edc
> +
>   HEAD is now at 32a3438... fff
>   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
>   $ hg id -n
> 
> ERROR: test-subrepo-git.t output changed
> 
> diff --git a/tests/test-subrepo-git.t b/tests/test-subrepo-git.t
> --- a/tests/test-subrepo-git.t
> +++ b/tests/test-subrepo-git.t
> @@ -481,9 +481,7 @@ Sticky subrepository, file changes and r
>   $ cd ..
> 
> Sticky repository, update --clean
> -  $ hg update --clean tip
> -  Previous HEAD position was aa84837... f
> -  HEAD is now at 32a3438... fff
> +  $ hg update --clean tip 2>/dev/null
>   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
>   $ hg id -n
>   7
> _______________________________________________
> Mercurial-devel mailing list
> Mercurial-devel at selenic.com
> http://selenic.com/mailman/listinfo/mercurial-devel

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://selenic.com/pipermail/mercurial-devel/attachments/20120319/3193e3b0/attachment.html>