Mercurial > hg
comparison tests/test-merge-tools @ 7846:1cb6836946be
test-merge-tools: test ui.merge functionality and selection of internal tools
| author | Mads Kiilerich <mads@kiilerich.com> |
|---|---|
| date | Mon, 09 Mar 2009 18:44:44 +0100 |
| parents | 660c8dd44060 |
| children | 9a4fe59b1eca |
comparison
equal
deleted
inserted
replaced
| 7845:c2cd8d772805 | 7846:1cb6836946be |
|---|---|
| 102 domerge -r 2 --config merge-patterns.f=true --config merge-tools.true.executable=nonexistingmergetool | 102 domerge -r 2 --config merge-patterns.f=true --config merge-tools.true.executable=nonexistingmergetool |
| 103 | 103 |
| 104 echo "# merge-patterns specifies executable with bogus path and gets warning:" | 104 echo "# merge-patterns specifies executable with bogus path and gets warning:" |
| 105 domerge -r 2 --config merge-patterns.f=true --config merge-tools.true.executable=/bin/nonexistingmergetool | 105 domerge -r 2 --config merge-patterns.f=true --config merge-tools.true.executable=/bin/nonexistingmergetool |
| 106 | 106 |
| 107 echo | |
| 108 echo ui.merge overrules priority | |
| 109 echo | |
| 110 | |
| 111 echo "# ui.merge specifies false:" | |
| 112 domerge -r 2 --config ui.merge=false | |
| 113 | |
| 114 echo "# ui.merge specifies internal:fail:" | |
| 115 domerge -r 2 --config ui.merge=internal:fail | |
| 116 | |
| 117 echo "# ui.merge specifies internal:local:" | |
| 118 domerge -r 2 --config ui.merge=internal:local | |
| 119 | |
| 120 echo "# ui.merge specifies internal:other:" | |
| 121 domerge -r 2 --config ui.merge=internal:other | |
| 122 | |
| 123 echo "# ui.merge specifies internal:other but is overruled by pattern for false:" | |
| 124 domerge -r 2 --config ui.merge=internal:other --config merge-patterns.f=false | |
| 107 | 125 |
| 108 echo | 126 echo |
| 109 echo Premerge | 127 echo Premerge |
| 110 echo | 128 echo |
| 111 | 129 |