git-si 0.2.3 → 0.2.4
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/git/si/version.rb +1 -1
- data/lib/git/si.rb +5 -1
- metadata +2 -2
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 4685908b89dbddc4f3109c5151d448f404671e4d
|
|
4
|
+
data.tar.gz: 625f88967c58c4d7eb7b58763ab7c9d42b42ea76
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 5e8de12a928e493f16d6028bbd474963a3ea75dfc8e12f039a4be0140d91503a6814d4787fcac9ed2a892dc47a38fb8e5f1d2ed55737aa9194c00100edfa251d
|
|
7
|
+
data.tar.gz: fc4199a2c41eac79973432f8e5fe8313cdd7d7b27fead45007ce3e81957412c580f9335eed413a1043fe36ac2f13f34a1fad0e535ce9e76914df7da8a1955181
|
data/lib/git/si/version.rb
CHANGED
data/lib/git/si.rb
CHANGED
|
@@ -77,7 +77,11 @@ use the commands below.
|
|
|
77
77
|
results = git_log.match(/svn update to version (\d+)/i)
|
|
78
78
|
last_rebased_version = results[1] if results
|
|
79
79
|
if last_fetched_version and last_rebased_version
|
|
80
|
-
|
|
80
|
+
if last_fetched_version > last_rebased_version
|
|
81
|
+
raise VersionError.new("This branch is out-of-date (rev #{last_rebased_version}; mirror branch is at #{last_fetched_version}). You should do a git si rebase.")
|
|
82
|
+
elsif last_fetched_version < last_rebased_version
|
|
83
|
+
return if ask("This branch is newer (rev #{last_rebased_version}) than the mirror branch (rev #{last_fetched_version}). That can happen when svn changes have been made directly and may be fine. Do you want to continue? [Y/n] ", :green) =~ /\s*^n/i
|
|
84
|
+
end
|
|
81
85
|
else
|
|
82
86
|
notice_message "Could not determine last version information. This may be fine if you haven't used git-si before."
|
|
83
87
|
end
|
metadata
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: git-si
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 0.2.
|
|
4
|
+
version: 0.2.4
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Payton Swick
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: bin
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date: 2014-01-
|
|
11
|
+
date: 2014-01-09 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: bundler
|