svn_command_helper 0.3.5 → 0.3.6
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 +1 -1
- 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: 9d3f6d5a96922029a3f8da3753010fa54db3a763
|
|
4
|
+
data.tar.gz: 34f04762e8b3a0e57049b454f15ab3531e19f592
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: c7462c878848c66b0e0c32ef0b7f463a36802b6f9a2c683471b9912aa3123d716886667ac88dfade2b5aaea079853a37c8dfe3706dc5845dc65721c5b21d412b
|
|
7
|
+
data.tar.gz: 73d0b562e8ef4f0f91f40af060e5f8b6e2c54ac393d65cea3940175ea6b5f2a94e2dad12d865be4a2d0434c9483b40ef05e95915caae50fe44064f7ed8500368
|
data/lib/svn_command_helper.rb
CHANGED
|
@@ -183,8 +183,8 @@ module SvnCommandHelper
|
|
|
183
183
|
unless only_from_transactions.empty?
|
|
184
184
|
sys "svn copy --parents #{only_from_transactions.map(&:from).join(' ')} ."
|
|
185
185
|
end
|
|
186
|
+
sys "svn update --set-depth infinity #{to_exist_transactions.map(&:file).join(' ')}"
|
|
186
187
|
to_exist_transactions.each do |_transaction|
|
|
187
|
-
sys "svn update --set-depth infinity #{_transaction.file}"
|
|
188
188
|
sys "svn merge --accept theirs-full #{_transaction.from} #{_transaction.file}"
|
|
189
189
|
end
|
|
190
190
|
Svn.commit(message, ".")
|