[PATCH] tests: rename test-merge2 to something more descriptive

[Martin Geisler]

Greg Ward <greg-hg at gerg.ca> writes:

> # HG changeset patch
> # User Greg Ward <greg-hg at gerg.ca>
> # Date 1276540770 14400
> # Node ID 39d4534094c12f1b679be1e203e6b5cc21a4f859
> # Parent  07ba7f1dcd307e6fbd8f0f7c36ca78ac83fb18e6
> tests: rename test-merge2 to something more descriptive
>
> (Although I don't actually see how this test touches merging in any
> way, since it runs neither 'hg merge' nor 'hg update'.)

I also don't see the merge in this script. So perhaps we should rename
it to something else entirely when we figure out what's going on?

> diff --git a/tests/test-merge2 b/tests/test-merge-deleted
> rename from tests/test-merge2
> rename to tests/test-merge-deleted
> --- a/tests/test-merge2
> +++ b/tests/test-merge-deleted
> @@ -1,5 +1,9 @@
>  #!/bin/sh
>  
> +# test simultaneous deletion of a file in both the working directory and
> +# in a merged branch (or at least that's what the original commit
> +# message says: there's no actual merging in this test script)
> +
>  mkdir t
>  cd t
>  hg init
> diff --git a/tests/test-merge2.out b/tests/test-merge-deleted.out
> rename from tests/test-merge2.out
> rename to tests/test-merge-deleted.out
> _______________________________________________
> Mercurial-devel mailing list
> Mercurial-devel at selenic.com
> http://selenic.com/mailman/listinfo/mercurial-devel

-- 
Martin Geisler

aragost Trifork
Professional Mercurial support
http://aragost.com/mercurial/