Mercurial > hg
comparison tests/test-merge-tools.t @ 39183:7a111168659e
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.
author | Matt Harbison <matt_harbison@yahoo.com> |
---|---|
date | Sat, 18 Aug 2018 23:39:26 -0400 |
parents | cded904f7acc |
children | 82555d7186d0 |
comparison
equal
deleted
inserted
replaced
39182:d39b1f7e5dcf | 39183:7a111168659e |
---|---|
1699 $ hg merge --config merge-tools.true.executable="true" -r 5 | 1699 $ hg merge --config merge-tools.true.executable="true" -r 5 |
1700 merging "; exit 1; echo " | 1700 merging "; exit 1; echo " |
1701 0 files updated, 1 files merged, 0 files removed, 0 files unresolved | 1701 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
1702 (branch merge, don't forget to commit) | 1702 (branch merge, don't forget to commit) |
1703 $ hg update -C 1 > /dev/null | 1703 $ hg update -C 1 > /dev/null |
1704 | |
1705 #else | |
1706 | |
1707 Match the non-portable filename commits above for test stability | |
1708 | |
1709 $ hg import --bypass -q - << EOF | |
1710 > # HG changeset patch | |
1711 > revision 5 | |
1712 > | |
1713 > diff --git a/"; exit 1; echo " b/"; exit 1; echo " | |
1714 > new file mode 100644 | |
1715 > --- /dev/null | |
1716 > +++ b/"; exit 1; echo " | |
1717 > @@ -0,0 +1,1 @@ | |
1718 > +revision 5 | |
1719 > EOF | |
1720 | |
1721 $ hg import --bypass -q - << EOF | |
1722 > # HG changeset patch | |
1723 > revision 6 | |
1724 > | |
1725 > diff --git a/"; exit 1; echo " b/"; exit 1; echo " | |
1726 > new file mode 100644 | |
1727 > --- /dev/null | |
1728 > +++ b/"; exit 1; echo " | |
1729 > @@ -0,0 +1,1 @@ | |
1730 > +revision 6 | |
1731 > EOF | |
1732 | |
1704 #endif | 1733 #endif |
1705 | 1734 |
1706 Merge post-processing | 1735 Merge post-processing |
1707 | 1736 |
1708 cat is a bad merge-tool and doesn't change: | 1737 cat is a bad merge-tool and doesn't change: |
1758 revision 2 | 1787 revision 2 |
1759 space | 1788 space |
1760 0 files updated, 1 files merged, 0 files removed, 0 files unresolved | 1789 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
1761 (branch merge, don't forget to commit) | 1790 (branch merge, don't forget to commit) |
1762 | 1791 |
1763 #if symlink | |
1764 | |
1765 internal merge cannot handle symlinks and shouldn't try: | |
1766 | |
1767 $ hg update -q -C 1 | 1792 $ hg update -q -C 1 |
1768 $ rm f | 1793 $ rm f |
1794 | |
1795 internal merge cannot handle symlinks and shouldn't try: | |
1796 | |
1797 #if symlink | |
1798 | |
1769 $ ln -s symlink f | 1799 $ ln -s symlink f |
1770 $ hg commit -qm 'f is symlink' | 1800 $ hg commit -qm 'f is symlink' |
1801 | |
1802 #else | |
1803 | |
1804 $ hg import --bypass -q - << EOF | |
1805 > # HG changeset patch | |
1806 > f is symlink | |
1807 > | |
1808 > diff --git a/f b/f | |
1809 > old mode 100644 | |
1810 > new mode 120000 | |
1811 > --- a/f | |
1812 > +++ b/f | |
1813 > @@ -1,2 +1,1 @@ | |
1814 > -revision 1 | |
1815 > -space | |
1816 > +symlink | |
1817 > \ No newline at end of file | |
1818 > EOF | |
1819 | |
1820 Resolve 'other [destination] changed f which local [working copy] deleted' prompt | |
1821 $ hg up -q -C --config ui.interactive=True << EOF | |
1822 > c | |
1823 > EOF | |
1824 | |
1825 #endif | |
1826 | |
1771 $ hg merge -r 2 --tool internal:merge | 1827 $ hg merge -r 2 --tool internal:merge |
1772 merging f | 1828 merging f |
1773 warning: internal :merge cannot merge symlinks for f | 1829 warning: internal :merge cannot merge symlinks for f |
1774 warning: conflicts while merging f! (edit, then use 'hg resolve --mark') | 1830 warning: conflicts while merging f! (edit, then use 'hg resolve --mark') |
1775 0 files updated, 0 files merged, 0 files removed, 1 files unresolved | 1831 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
1776 use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon | 1832 use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon |
1777 [1] | 1833 [1] |
1778 | |
1779 #endif | |
1780 | 1834 |
1781 Verify naming of temporary files and that extension is preserved: | 1835 Verify naming of temporary files and that extension is preserved: |
1782 | 1836 |
1783 $ hg update -q -C 1 | 1837 $ hg update -q -C 1 |
1784 $ hg mv f f.txt | 1838 $ hg mv f f.txt |