svn_command_helper 0.3.5 → 0.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a028a1e9822a53434315d69b8528a34a64fa55ef
-  data.tar.gz: 0f1ab9975da8d816ad010e9899805d00b45f9486
+  metadata.gz: 9d3f6d5a96922029a3f8da3753010fa54db3a763
+  data.tar.gz: 34f04762e8b3a0e57049b454f15ab3531e19f592
 SHA512:
-  metadata.gz: 4307d2df9c918208c195768994c5e7cba9b8c0d90df86746f880d7d3069f0b5b2e9bda7ffd5b1046785a91e7e1e97470142e0a539e0bbf2da4332ac3384e1827
-  data.tar.gz: 5dbe0db9007a5ab489addf4e5cf6f73cafd40e76afca1cd5222e5c64d24969ca79668f4625c1b0c1e39542bcd6dc537c2c4259fef8b4340460be73ed5ea9f25b
+  metadata.gz: c7462c878848c66b0e0c32ef0b7f463a36802b6f9a2c683471b9912aa3123d716886667ac88dfade2b5aaea079853a37c8dfe3706dc5845dc65721c5b21d412b
+  data.tar.gz: 73d0b562e8ef4f0f91f40af060e5f8b6e2c54ac393d65cea3940175ea6b5f2a94e2dad12d865be4a2d0434c9483b40ef05e95915caae50fe44064f7ed8500368

data/lib/svn_command_helper.rb

@@ -183,8 +183,8 @@ module SvnCommandHelper
               unless only_from_transactions.empty?
                 sys "svn copy --parents #{only_from_transactions.map(&:from).join(' ')} ."
               end
+              sys "svn update --set-depth infinity #{to_exist_transactions.map(&:file).join(' ')}"
               to_exist_transactions.each do |_transaction|
-                sys "svn update --set-depth infinity #{_transaction.file}"
                 sys "svn merge --accept theirs-full #{_transaction.from} #{_transaction.file}"
               end
               Svn.commit(message, ".")

data/lib/svn_command_helper/version.rb

@@ -1,4 +1,4 @@
 module SvnCommandHelper
   # version
-  VERSION = "0.3.5"
+  VERSION = "0.3.6"
 end

metadata

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