| 1 | #!/bin/sh |
| 2 | # |
| 3 | # Copyright (c) 2007 Eric Wong |
| 4 | # Based on a script by Joakim Tjernlund <joakim.tjernlund@transmode.se> |
| 5 | |
| 6 | test_description='git svn dcommit handles merges' |
| 7 | |
| 8 | . ./lib-git-svn.sh |
| 9 | |
| 10 | big_text_block () { |
| 11 | cat << EOF |
| 12 | # |
| 13 | # (C) Copyright 2000 - 2005 |
| 14 | # Wolfgang Denk, DENX Software Engineering, wd@denx.de. |
| 15 | # |
| 16 | # See file CREDITS for list of people who contributed to this |
| 17 | # project. |
| 18 | # |
| 19 | # This program is free software; you can redistribute it and/or |
| 20 | # modify it under the terms of the GNU General Public License as |
| 21 | # published by the Free Software Foundation; either version 2 of |
| 22 | # the License, or (at your option) any later version. |
| 23 | # |
| 24 | # This program is distributed in the hope that it will be useful, |
| 25 | # but WITHOUT ANY WARRANTY; without even the implied warranty of |
| 26 | # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
| 27 | # GNU General Public License for more details. |
| 28 | # |
| 29 | # You should have received a copy of the GNU General Public License |
| 30 | # along with this program; if not, see <https://www.gnu.org/licenses/>. |
| 31 | # |
| 32 | EOF |
| 33 | } |
| 34 | |
| 35 | test_expect_success 'setup svn repository' ' |
| 36 | svn_cmd co "$svnrepo" mysvnwork && |
| 37 | mkdir -p mysvnwork/trunk && |
| 38 | ( |
| 39 | cd mysvnwork && |
| 40 | big_text_block >>trunk/README && |
| 41 | svn_cmd add trunk && |
| 42 | svn_cmd ci -m "first commit" trunk |
| 43 | ) |
| 44 | ' |
| 45 | |
| 46 | test_expect_success 'setup git mirror and merge' ' |
| 47 | git svn init "$svnrepo" -t tags -T trunk -b branches && |
| 48 | git svn fetch && |
| 49 | git checkout -b svn remotes/origin/trunk && |
| 50 | git checkout -b merge && |
| 51 | echo new file > new_file && |
| 52 | git add new_file && |
| 53 | git commit -a -m "New file" && |
| 54 | echo hello >> README && |
| 55 | git commit -a -m "hello" && |
| 56 | echo add some stuff >> new_file && |
| 57 | git commit -a -m "add some stuff" && |
| 58 | git checkout svn && |
| 59 | mv -f README tmp && |
| 60 | echo friend > README && |
| 61 | cat tmp >> README && |
| 62 | git commit -a -m "friend" && |
| 63 | git merge merge |
| 64 | ' |
| 65 | |
| 66 | test_debug 'gitk --all & sleep 1' |
| 67 | |
| 68 | test_expect_success 'verify pre-merge ancestry' " |
| 69 | test x\$(git rev-parse --verify refs/heads/svn^2) = \ |
| 70 | x\$(git rev-parse --verify refs/heads/merge) && |
| 71 | git cat-file commit refs/heads/svn^ >actual && |
| 72 | grep '^friend$' actual |
| 73 | " |
| 74 | |
| 75 | test_expect_success 'git svn dcommit merges' " |
| 76 | git svn dcommit |
| 77 | " |
| 78 | |
| 79 | test_debug 'gitk --all & sleep 1' |
| 80 | |
| 81 | test_expect_success 'verify post-merge ancestry' " |
| 82 | test x\$(git rev-parse --verify refs/heads/svn) = \ |
| 83 | x\$(git rev-parse --verify refs/remotes/origin/trunk) && |
| 84 | test x\$(git rev-parse --verify refs/heads/svn^2) = \ |
| 85 | x\$(git rev-parse --verify refs/heads/merge) && |
| 86 | git cat-file commit refs/heads/svn^ >actual && |
| 87 | grep '^friend$' actual |
| 88 | " |
| 89 | |
| 90 | test_expect_success 'verify merge commit message' " |
| 91 | git rev-list --pretty=raw -1 refs/heads/svn >actual && |
| 92 | grep \" Merge branch 'merge' into svn\" actual |
| 93 | " |
| 94 | |
| 95 | test_done |