001 $ sh t9106-git-svn-commit-diff-clobber.sh -v 002 * expecting success: 003 mkdir import && 004 cd import && 005 echo initial > file && 006 svn import -m 'initial' . file:///users/mspang/src/git/git/t/trash/svnrepo && 007 cd .. && 008 echo initial > file && 009 git update-index --add file && 010 git commit -a -m 'initial' 011 012 Adding file 013 014 Committed revision 1. 015 Created initial commit 39d53013acc58c2675a4d856da562282c21f5235 016 1 files changed, 1 insertions(+), 0 deletions(-) 017 create mode 100644 file 018 * ok 1: initialize repo 019 020 * expecting success: 021 svn co file:///users/mspang/src/git/git/t/trash/svnrepo t.svn && 022 cd t.svn && 023 echo second line from svn >> file && 024 svn commit -m 'second line from svn' && 025 cd .. && 026 rm -rf t.svn 027 028 A t.svn/file 029 Checked out revision 1. [missing] Sending file [missing] Transmitting file data . [missing] Committed revision 2. 030 * ok 2: commit change from svn side 031 032 * expecting failure: 033 echo second line from git >> file && 034 git commit -a -m 'second line from git' && 035 git-svn commit-diff -r1 HEAD~1 HEAD file:///users/mspang/src/git/git/t/trash/svnrepo 036 037 Created commit eafa51760d91bfcfa1ce7e4f18bd0854cc723333 038 1 files changed, 1 insertions(+), 0 deletions(-) 039 diff-tree HEAD~1 HEAD 040 M file 041 Committed 2 042 * FAIL 3: commit conflicting change from git [fails due to last missing commit] 043 044 echo second line from git >> file && 045 git commit -a -m 'second line from git' && 046 git-svn commit-diff -r1 HEAD~1 HEAD file:///users/mspang/src/git/git/t/trash/svnrepo 047 048 049 * expecting success: 050 git reset --hard HEAD~1 && 051 echo second line from svn >> file && 052 git commit -a -m 'second line from svn' && 053 echo third line from git >> file && 054 git commit -a -m 'third line from git' && 055 git-svn commit-diff -r2 HEAD~1 HEAD file:///users/mspang/src/git/git/t/trash/svnrepo 056 057 HEAD is now at 39d5301... initial 058 Created commit c8ce91056ec7f8082bc1f86f5233b3c73f952ff5 059 1 files changed, 1 insertions(+), 0 deletions(-) 060 Created commit c6cfbf71727661a3ca3d25144fe0c579ff8e02fb 061 1 files changed, 1 insertions(+), 0 deletions(-) 062 diff-tree HEAD~1 HEAD 063 M file 064 Committed 3 065 * ok 4: commit complementing change from git 066 067 * expecting failure: 068 git-svn init file:///users/mspang/src/git/git/t/trash/svnrepo && 069 git-svn fetch && 070 git reset --hard refs/remotes/git-svn && 071 svn co file:///users/mspang/src/git/git/t/trash/svnrepo t.svn && 072 cd t.svn && 073 echo fourth line from svn >> file && 074 svn commit -m 'fourth line from svn' && 075 cd .. && 076 rm -rf t.svn && 077 echo 'fourth line from git' >> file && 078 git commit -a -m 'fourth line from git' && 079 git-svn dcommit 080 081 Fetching git-svn 082 r0 = 103011a5e58371b0034e4655e82bbda686e3e60b 083 A file 084 r1 = 2555b1052c176cd6de86b775797b9e7924c1ea04 085 M file 086 r2 = 3e520e5a40bda6e97c37e1ae37dbb0583608e7e1 087 M file 088 r3 = e47289f12d30749c4b25762d402cc1762afbdd01 089 HEAD is now at e47289f... third line from git 090 A t.svn/file 091 Checked out revision 3. [missing] Sending file [missing] Transmitting file data . [missing] Committed revision 4. 092 Created commit b5ccb76480136befc4d702e1c8764897162cbc72 093 1 files changed, 1 insertions(+), 0 deletions(-) 094 diff-tree b5ccb76480136befc4d702e1c8764897162cbc72~1 b5ccb76480136befc4d702e1c8764897162cbc72 095 M file 096 Committed 4 097 M file 098 r4 = acaf5f49b02286596bd8f27139bf374082c7afaf 099 No changes between current HEAD and refs/remotes/git-svn 100 Resetting to the latest refs/remotes/git-svn 101 * FAIL 5: dcommit fails to commit because of conflict [fails due to last missing commit] 102 103 git-svn init file:///users/mspang/src/git/git/t/trash/svnrepo && 104 git-svn fetch && 105 git reset --hard refs/remotes/git-svn && 106 svn co file:///users/mspang/src/git/git/t/trash/svnrepo t.svn && 107 cd t.svn && 108 echo fourth line from svn >> file && 109 svn commit -m 'fourth line from svn' && 110 cd .. && 111 rm -rf t.svn && 112 echo 'fourth line from git' >> file && 113 git commit -a -m 'fourth line from git' && 114 git-svn dcommit 115 116 117 * expecting success: 118 git reset --hard refs/remotes/git-svn && 119 echo 'index merge' > file2 && 120 git update-index --add file2 && 121 git commit -a -m 'index merge' && 122 echo 'more changes' >> file2 && 123 git update-index file2 && 124 git commit -a -m 'more changes' && 125 git-svn dcommit 126 127 HEAD is now at acaf5f4... fourth line from git 128 Created commit 4f898d08f8011241134e983cc30d98785e926f13 129 1 files changed, 1 insertions(+), 0 deletions(-) 130 create mode 100644 file2 131 Created commit 59cf4e5baa0fd3d444d3a084d5e8a87328ddfcae 132 1 files changed, 1 insertions(+), 0 deletions(-) 133 diff-tree 4f898d08f8011241134e983cc30d98785e926f13~1 4f898d08f8011241134e983cc30d98785e926f13 134 A file2 135 Committed 5 136 diff-tree 59cf4e5baa0fd3d444d3a084d5e8a87328ddfcae~1 59cf4e5baa0fd3d444d3a084d5e8a87328ddfcae 137 M file2 138 Committed 6 139 A file2 140 r5 = caed42b00cded960103b70a51b4c81194f94c960 141 M file2 142 r6 = 8e8a98024de9b2469e94815fea87492728ef1fc4 143 No changes between current HEAD and refs/remotes/git-svn 144 Resetting to the latest refs/remotes/git-svn 145 * ok 6: dcommit does the svn equivalent of an index merge 146 147 * failed 2 among 6 test(s)