svn_command_helper 0.3.8 → 0.3.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5026f85c3ae81b6969d453fb062721f083dade96
-  data.tar.gz: 198bb4bd21377566fe2f26407954e590e374bde8
+  metadata.gz: 655cd1cac60124bbd87ab0f15f36f577e7ccacf1
+  data.tar.gz: 28103a1f64ca7457dbdef22966bf7e98526fb29a
 SHA512:
-  metadata.gz: e3265d6ec6398c410c732e3387586b9fe5082f023f08c32bc4c02a13e3ad224696e544ca7e62301d9b2ca66de10e42532bc95fbae56b2cc8728006efd50b0622
-  data.tar.gz: 55a33dea9a2ff32beada581139ec1a461be3af6dced99efed9db0894f2c7fa46881ec4080a6f281f994b03fc1e80bb5c5b12c3cd1249941a713b6331b6b57053
+  metadata.gz: 3b1f6c4d5e6fbf0eddbc286358f6c64e0ee3b8248ebc95493f85c99d22146d451bdf18edd1466b4a150a0d0bb63bd6cd407591df66b5148eded20f904ba9b7a2
+  data.tar.gz: 8fecd1a1ec2529943fe7348576f33348701a043f2ec5f3595d9712293296bad350b9267c10a43ffe08878ed1763343cb4083ef5338342311408ec26d6685b45a

data/lib/svn_command_helper/version.rb

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

data/lib/svn_command_helper.rb

@@ -189,7 +189,7 @@ 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 #{_transaction.from} #{_transaction.file}"
+                sys "svn merge --accept theirs-full --ignore-ancestry #{_transaction.from} #{_transaction.file}"
               end
               Svn.commit(message, ".")
             end
@@ -213,7 +213,7 @@ module SvnCommandHelper
               Svn.update_deep(relative_to, "empty") # mkpath的な なくてもエラーにはならないので
 
               if transaction.to_exist?  # toがある場合マージ
-                sys "svn merge --accept theirs-full #{transaction.from} #{relative_to}"
+                sys "svn merge --accept theirs-full --ignore-ancestry #{transaction.from} #{relative_to}"
               else # toがない場合コピー
                 sys "svn copy --parents #{transaction.from} #{relative_to}"
               end

metadata

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