svn_command_helper 0.3.4 → 0.3.5
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/svn_command_helper/version.rb +1 -1
- data/lib/svn_command_helper.rb +4 -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: a028a1e9822a53434315d69b8528a34a64fa55ef
|
4
|
+
data.tar.gz: 0f1ab9975da8d816ad010e9899805d00b45f9486
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 4307d2df9c918208c195768994c5e7cba9b8c0d90df86746f880d7d3069f0b5b2e9bda7ffd5b1046785a91e7e1e97470142e0a539e0bbf2da4332ac3384e1827
|
7
|
+
data.tar.gz: 5dbe0db9007a5ab489addf4e5cf6f73cafd40e76afca1cd5222e5c64d24969ca79668f4625c1b0c1e39542bcd6dc537c2c4259fef8b4340460be73ed5ea9f25b
|
data/lib/svn_command_helper.rb
CHANGED
@@ -180,7 +180,9 @@ module SvnCommandHelper
|
|
180
180
|
Dir.mktmpdir do |dir|
|
181
181
|
Dir.chdir(dir) do
|
182
182
|
sys "svn checkout --depth empty #{transaction.to_base} ."
|
183
|
-
|
183
|
+
unless only_from_transactions.empty?
|
184
|
+
sys "svn copy --parents #{only_from_transactions.map(&:from).join(' ')} ."
|
185
|
+
end
|
184
186
|
to_exist_transactions.each do |_transaction|
|
185
187
|
sys "svn update --set-depth infinity #{_transaction.file}"
|
186
188
|
sys "svn merge --accept theirs-full #{_transaction.from} #{_transaction.file}"
|
@@ -311,7 +313,7 @@ module SvnCommandHelper
|
|
311
313
|
# relative to path from given base uri
|
312
314
|
# @return [String] relative to path
|
313
315
|
def relative_to(path)
|
314
|
-
File.join(
|
316
|
+
File.join(relative_to_base(path), @file)
|
315
317
|
end
|
316
318
|
end
|
317
319
|
end
|