svn_command_helper 0.3.9 → 0.3.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 655cd1cac60124bbd87ab0f15f36f577e7ccacf1
-  data.tar.gz: 28103a1f64ca7457dbdef22966bf7e98526fb29a
+  metadata.gz: 267670929581fa0ceda509ca3eb4f97b4d1036db
+  data.tar.gz: ff04500dd0a6f2a353461674bf735fb1b236f002
 SHA512:
-  metadata.gz: 3b1f6c4d5e6fbf0eddbc286358f6c64e0ee3b8248ebc95493f85c99d22146d451bdf18edd1466b4a150a0d0bb63bd6cd407591df66b5148eded20f904ba9b7a2
-  data.tar.gz: 8fecd1a1ec2529943fe7348576f33348701a043f2ec5f3595d9712293296bad350b9267c10a43ffe08878ed1763343cb4083ef5338342311408ec26d6685b45a
+  metadata.gz: 019d23b95308375edf0cdd4ead35e2167433c35dcbbbe7b4d37714050df6367bb897e540fc457159524e999255084ce2d9dbf7bfb909fcc8698b573d6f506c1e
+  data.tar.gz: 405d1854883dd8681112a574bf9ee79967e34076a813c6a14d3b987561ca5de318a1fea7a200dffa6ed8316b5e72a44f3c0583396a75ba0524cbbf73b796ac77

data/lib/svn_command_helper.rb

@@ -189,7 +189,8 @@ module SvnCommandHelper
               end
               sys "svn update --set-depth infinity #{to_exist_transactions.map(&:file).join(' ')}"
               to_exist_transactions.each do |_transaction|
-                sys "svn merge --accept theirs-full --ignore-ancestry #{_transaction.from} #{_transaction.file}"
+                sys "svn export --force #{_transaction.from} #{_transaction.file}"
+                sys "svn add --force #{_transaction.file}"
               end
               Svn.commit(message, ".")
             end
@@ -213,7 +214,8 @@ module SvnCommandHelper
               Svn.update_deep(relative_to, "empty") # mkpath的な なくてもエラーにはならないので
 
               if transaction.to_exist?  # toがある場合マージ
-                sys "svn merge --accept theirs-full --ignore-ancestry #{transaction.from} #{relative_to}"
+                sys "svn export --force #{transaction.from} #{relative_to}"
+                sys "svn add --force #{relative_to}"
               else # toがない場合コピー
                 sys "svn copy --parents #{transaction.from} #{relative_to}"
               end

data/lib/svn_command_helper/version.rb

@@ -1,4 +1,4 @@
 module SvnCommandHelper
   # version
-  VERSION = "0.3.9"
+  VERSION = "0.3.10"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: svn_command_helper
 version: !ruby/object:Gem::Version
-  version: 0.3.9
+  version: 0.3.10
 platform: ruby
 authors:
 - Narazaka