From 3d286c9148036796c3e9afc7c0ed9abaeb42fcee Mon Sep 17 00:00:00 2001
From: Carolyn Van Slyck <me@carolynvanslyck.com>
Date: Wed, 14 Jun 2017 11:16:10 -0500
Subject: [PATCH] Fix funky merge after refactoring

* Underlying() was renamed to Revision()
* Is() was renamed to Pair()
---
 internal/feedback/feedback.go      | 2 +-
 internal/feedback/feedback_test.go | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/internal/feedback/feedback.go b/internal/feedback/feedback.go
index 63bc20d2c3..166c8395f8 100644
--- a/internal/feedback/feedback.go
+++ b/internal/feedback/feedback.go
@@ -58,7 +58,7 @@ func NewLockedProjectFeedback(lp gps.LockedProject, depType string) *ConstraintF
 	switch vt := lp.Version().(type) {
 	case gps.PairedVersion:
 		cf.LockedVersion = vt.String()
-		cf.Revision = vt.Underlying().String()
+		cf.Revision = vt.Revision().String()
 	case gps.UnpairedVersion: // Logically this should never occur, but handle for completeness sake
 		cf.LockedVersion = vt.String()
 	case gps.Revision:
diff --git a/internal/feedback/feedback_test.go b/internal/feedback/feedback_test.go
index 630bb1ac80..51190e4099 100644
--- a/internal/feedback/feedback_test.go
+++ b/internal/feedback/feedback_test.go
@@ -52,8 +52,8 @@ func TestFeedback_Constraint(t *testing.T) {
 }
 
 func TestFeedback_LockedProject(t *testing.T) {
-	v := gps.NewVersion("v1.1.4").Is("bc29b4f")
-	b := gps.NewBranch("master").Is("436f39d")
+	v := gps.NewVersion("v1.1.4").Pair("bc29b4f")
+	b := gps.NewBranch("master").Pair("436f39d")
 	pi := gps.ProjectIdentifier{ProjectRoot: gps.ProjectRoot("github.com/foo/bar")}
 
 	cases := []struct {