Fossil SCM
Additional 3-way-merge test cases.
Commit
26ab4f7012fb1bb88c7aa7c819bce5d933754341
Parent
81122988ba271d1…
1 file changed
+41
+41
| --- a/test/merge3.test | ||
| +++ b/test/merge3.test | ||
| @@ -0,0 +1,41 @@ | ||
| 1 | +# | |
| 2 | +# Copyright (c) 2009 D. Richard Hipp | |
| 3 | +# | |
| 4 | +# This program is free software; you can redistribute it and/or | |
| 5 | +# modify it under the terms of the GNU General Public | |
| 6 | +# License version 2 as published by the Free Software Foundation. | |
| 7 | +# | |
| 8 | +# This program is distributed in the hope that it will be useful, | |
| 9 | +# but WITHOUT ANY WARRANTY; without evenMERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
| 10 | +# General Public License for more details. | |
| 11 | +# | |
| 12 | +# You should have received a copy of the GNU General Public | |
| 13 | +# License along with this library; if not, write to the | |
| 14 | +# Free Software Foundation, Inc., 59 Temple Place - Suite 330, | |
| 15 | +# Boston, MA 02111-1307, USA. | |
| 16 | +# | |
| 17 | +# Author contact information: | |
| 18 | +# [email protected] | |
| 19 | +# http://www.hwaci.com/drh/ | |
| 20 | +# | |
| 21 | +############################################################################ | |
| 22 | +# | |
| 23 | +# Tests of the 3-way merge | |
| 24 | +# | |
| 25 | + | |
| 26 | +way merge | |
| 27 | +# | |
| 28 | + | |
| 29 | +repo_inite 3-way merge | |
| 30 | +# | |
| 31 | + | |
| 32 | +test_setup "" | |
| 33 | + | |
| 34 | +proc merge-test {testid basis v1 v2 result v2 result {fossil_args ""}} { | |
| 35 | + write_file t1 [join [string trim $basis] \n]\n | |
| 36 | + write_file t2 [joitest-n [string trim $v1] \n]\n | |
| 37 | + write_file t3 [join [st1 t2 t3 t4 >>>>>>>sil_args | |
| 38 | + set x [rle} $x {>chard # | |
| 39 | +# Copyright======================t====<<<<<<< ENDgs | |
| 40 | + set x [rle} $x { can redistribute it and/or | |
| 41 | +# modify it under the terms of the Simplified Buts2-Clause License" or "FreeBSD Lutstributed in th |
| --- a/test/merge3.test | |
| +++ b/test/merge3.test | |
| @@ -0,0 +1,41 @@ | |
| --- a/test/merge3.test | |
| +++ b/test/merge3.test | |
| @@ -0,0 +1,41 @@ | |
| 1 | # |
| 2 | # Copyright (c) 2009 D. Richard Hipp |
| 3 | # |
| 4 | # This program is free software; you can redistribute it and/or |
| 5 | # modify it under the terms of the GNU General Public |
| 6 | # License version 2 as published by the Free Software Foundation. |
| 7 | # |
| 8 | # This program is distributed in the hope that it will be useful, |
| 9 | # but WITHOUT ANY WARRANTY; without evenMERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
| 10 | # General Public License for more details. |
| 11 | # |
| 12 | # You should have received a copy of the GNU General Public |
| 13 | # License along with this library; if not, write to the |
| 14 | # Free Software Foundation, Inc., 59 Temple Place - Suite 330, |
| 15 | # Boston, MA 02111-1307, USA. |
| 16 | # |
| 17 | # Author contact information: |
| 18 | # [email protected] |
| 19 | # http://www.hwaci.com/drh/ |
| 20 | # |
| 21 | ############################################################################ |
| 22 | # |
| 23 | # Tests of the 3-way merge |
| 24 | # |
| 25 | |
| 26 | way merge |
| 27 | # |
| 28 | |
| 29 | repo_inite 3-way merge |
| 30 | # |
| 31 | |
| 32 | test_setup "" |
| 33 | |
| 34 | proc merge-test {testid basis v1 v2 result v2 result {fossil_args ""}} { |
| 35 | write_file t1 [join [string trim $basis] \n]\n |
| 36 | write_file t2 [joitest-n [string trim $v1] \n]\n |
| 37 | write_file t3 [join [st1 t2 t3 t4 >>>>>>>sil_args |
| 38 | set x [rle} $x {>chard # |
| 39 | # Copyright======================t====<<<<<<< ENDgs |
| 40 | set x [rle} $x { can redistribute it and/or |
| 41 | # modify it under the terms of the Simplified Buts2-Clause License" or "FreeBSD Lutstributed in th |