svn_command_helper 0.3.8 → 0.3.9
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/lib/svn_command_helper/version.rb +1 -1
- data/lib/svn_command_helper.rb +2 -2
- metadata +1 -1
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 655cd1cac60124bbd87ab0f15f36f577e7ccacf1
|
|
4
|
+
data.tar.gz: 28103a1f64ca7457dbdef22966bf7e98526fb29a
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 3b1f6c4d5e6fbf0eddbc286358f6c64e0ee3b8248ebc95493f85c99d22146d451bdf18edd1466b4a150a0d0bb63bd6cd407591df66b5148eded20f904ba9b7a2
|
|
7
|
+
data.tar.gz: 8fecd1a1ec2529943fe7348576f33348701a043f2ec5f3595d9712293296bad350b9267c10a43ffe08878ed1763343cb4083ef5338342311408ec26d6685b45a
|
data/lib/svn_command_helper.rb
CHANGED
|
@@ -189,7 +189,7 @@ module SvnCommandHelper
|
|
|
189
189
|
end
|
|
190
190
|
sys "svn update --set-depth infinity #{to_exist_transactions.map(&:file).join(' ')}"
|
|
191
191
|
to_exist_transactions.each do |_transaction|
|
|
192
|
-
sys "svn merge --accept theirs-full #{_transaction.from} #{_transaction.file}"
|
|
192
|
+
sys "svn merge --accept theirs-full --ignore-ancestry #{_transaction.from} #{_transaction.file}"
|
|
193
193
|
end
|
|
194
194
|
Svn.commit(message, ".")
|
|
195
195
|
end
|
|
@@ -213,7 +213,7 @@ module SvnCommandHelper
|
|
|
213
213
|
Svn.update_deep(relative_to, "empty") # mkpath的な なくてもエラーにはならないので
|
|
214
214
|
|
|
215
215
|
if transaction.to_exist? # toがある場合マージ
|
|
216
|
-
sys "svn merge --accept theirs-full #{transaction.from} #{relative_to}"
|
|
216
|
+
sys "svn merge --accept theirs-full --ignore-ancestry #{transaction.from} #{relative_to}"
|
|
217
217
|
else # toがない場合コピー
|
|
218
218
|
sys "svn copy --parents #{transaction.from} #{relative_to}"
|
|
219
219
|
end
|