git-si 0.2.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5fa4cb1490e4fa174cd2b63a1b99891d81f9c62a
-  data.tar.gz: 411468912a2bb99f923e03eea0c60edb7876e727
+  metadata.gz: 4685908b89dbddc4f3109c5151d448f404671e4d
+  data.tar.gz: 625f88967c58c4d7eb7b58763ab7c9d42b42ea76
 SHA512:
-  metadata.gz: a58ab96d2bcd37856541fed3b6e41b3a21c75690f995d78085507313e16c4b801426a94b8fd458dd3109e1d832e31ee450921d810f408725e22aaf467ac6193f
-  data.tar.gz: 2baf357e1ad7f4232daba0c2df746d4daf321c863438b33afea37c42f870519aedfbad676236a600c9b954265f2de3ecb4e0ddec44dd2b7629e84752a5f9dea1
+  metadata.gz: 5e8de12a928e493f16d6028bbd474963a3ea75dfc8e12f039a4be0140d91503a6814d4787fcac9ed2a892dc47a38fb8e5f1d2ed55737aa9194c00100edfa251d
+  data.tar.gz: fc4199a2c41eac79973432f8e5fe8313cdd7d7b27fead45007ce3e81957412c580f9335eed413a1043fe36ac2f13f34a1fad0e535ce9e76914df7da8a1955181

data/lib/git/si/version.rb

@@ -1,5 +1,5 @@
 module Git
   module Si
-    VERSION = "0.2.3"
+    VERSION = "0.2.4"
   end
 end

data/lib/git/si.rb

@@ -77,7 +77,11 @@ use the commands below.
           results = git_log.match(/svn update to version (\d+)/i)
           last_rebased_version = results[1] if results
           if last_fetched_version and last_rebased_version
-            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.") if last_fetched_version != last_rebased_version
+            if last_fetched_version > last_rebased_version
+              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.")
+            elsif last_fetched_version < last_rebased_version
+              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
+            end
           else
             notice_message "Could not determine last version information. This may be fine if you haven't used git-si before."
           end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: git-si
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors:
 - Payton Swick
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-06 00:00:00.000000000 Z
+date: 2014-01-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler