From 9c6e2cdc2167abba570a1a87ab492ef73a41e628 Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <mitchell.hashimoto@gmail.com>
Date: Wed, 25 Mar 2015 15:40:53 -0700
Subject: [PATCH] terraform: make sure our serial is always higher

---
 terraform/state.go | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/terraform/state.go b/terraform/state.go
index 4ec772fd20..1a1a28bea8 100644
--- a/terraform/state.go
+++ b/terraform/state.go
@@ -224,6 +224,10 @@ func (s *State) IncrementSerialMaybe(other *State) {
 		return
 	}
 	if !s.Equal(other) {
+		if other.Serial > s.Serial {
+			s.Serial = other.Serial
+		}
+
 		s.Serial++
 	}
 }