Skip to content
Snippets Groups Projects
Commit 7a111168 authored by Matt Harbison's avatar Matt Harbison
Browse files

tests: stabilize test-merge-tools.t on Windows

More fun with `hg import --bypass` to work around Windows limitations.  The
diffs were generated on Linux, and had a tab to terminate the `+++b/...` lines.
But check-code complained about trailing whitespace, and it seems to run without
them.
parent d39b1f7e
No related branches found
No related tags found
No related merge requests found
......@@ -1701,6 +1701,35 @@
0 files updated, 1 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
$ hg update -C 1 > /dev/null
#else
Match the non-portable filename commits above for test stability
$ hg import --bypass -q - << EOF
> # HG changeset patch
> revision 5
>
> diff --git a/"; exit 1; echo " b/"; exit 1; echo "
> new file mode 100644
> --- /dev/null
> +++ b/"; exit 1; echo "
> @@ -0,0 +1,1 @@
> +revision 5
> EOF
$ hg import --bypass -q - << EOF
> # HG changeset patch
> revision 6
>
> diff --git a/"; exit 1; echo " b/"; exit 1; echo "
> new file mode 100644
> --- /dev/null
> +++ b/"; exit 1; echo "
> @@ -0,0 +1,1 @@
> +revision 6
> EOF
#endif
Merge post-processing
......@@ -1760,7 +1789,8 @@
0 files updated, 1 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
#if symlink
$ hg update -q -C 1
$ rm f
internal merge cannot handle symlinks and shouldn't try:
......@@ -1764,7 +1794,7 @@
internal merge cannot handle symlinks and shouldn't try:
$ hg update -q -C 1
$ rm f
#if symlink
$ ln -s symlink f
$ hg commit -qm 'f is symlink'
......@@ -1769,5 +1799,31 @@
$ ln -s symlink f
$ hg commit -qm 'f is symlink'
#else
$ hg import --bypass -q - << EOF
> # HG changeset patch
> f is symlink
>
> diff --git a/f b/f
> old mode 100644
> new mode 120000
> --- a/f
> +++ b/f
> @@ -1,2 +1,1 @@
> -revision 1
> -space
> +symlink
> \ No newline at end of file
> EOF
Resolve 'other [destination] changed f which local [working copy] deleted' prompt
$ hg up -q -C --config ui.interactive=True << EOF
> c
> EOF
#endif
$ hg merge -r 2 --tool internal:merge
merging f
warning: internal :merge cannot merge symlinks for f
......@@ -1776,8 +1832,6 @@
use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
[1]
#endif
Verify naming of temporary files and that extension is preserved:
$ hg update -q -C 1
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment