svn_command_helper 0.3.9 → 0.3.10
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.rb +4 -2
- data/lib/svn_command_helper/version.rb +1 -1
- 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: 267670929581fa0ceda509ca3eb4f97b4d1036db
|
|
4
|
+
data.tar.gz: ff04500dd0a6f2a353461674bf735fb1b236f002
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 019d23b95308375edf0cdd4ead35e2167433c35dcbbbe7b4d37714050df6367bb897e540fc457159524e999255084ce2d9dbf7bfb909fcc8698b573d6f506c1e
|
|
7
|
+
data.tar.gz: 405d1854883dd8681112a574bf9ee79967e34076a813c6a14d3b987561ca5de318a1fea7a200dffa6ed8316b5e72a44f3c0583396a75ba0524cbbf73b796ac77
|
data/lib/svn_command_helper.rb
CHANGED
|
@@ -189,7 +189,8 @@ 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
|
|
192
|
+
sys "svn export --force #{_transaction.from} #{_transaction.file}"
|
|
193
|
+
sys "svn add --force #{_transaction.file}"
|
|
193
194
|
end
|
|
194
195
|
Svn.commit(message, ".")
|
|
195
196
|
end
|
|
@@ -213,7 +214,8 @@ module SvnCommandHelper
|
|
|
213
214
|
Svn.update_deep(relative_to, "empty") # mkpath的な なくてもエラーにはならないので
|
|
214
215
|
|
|
215
216
|
if transaction.to_exist? # toがある場合マージ
|
|
216
|
-
sys "svn
|
|
217
|
+
sys "svn export --force #{transaction.from} #{relative_to}"
|
|
218
|
+
sys "svn add --force #{relative_to}"
|
|
217
219
|
else # toがない場合コピー
|
|
218
220
|
sys "svn copy --parents #{transaction.from} #{relative_to}"
|
|
219
221
|
end
|