Merge lp://staging/~sinzui/juju-core/deps-fix into lp://staging/~go-bot/juju-core/trunk

Proposed by Curtis Hovey
Status: Merged
Approved by: Curtis Hovey
Approved revision: no longer in the source branch.
Merged at revision: 2274
Proposed branch: lp://staging/~sinzui/juju-core/deps-fix
Merge into: lp://staging/~go-bot/juju-core/trunk
Diff against target: 12 lines (+1/-1)
1 file modified
dependencies.tsv (+1/-1)
To merge this branch: bzr merge lp://staging/~sinzui/juju-core/deps-fix
Reviewer Review Type Date Requested Status
Juju Engineering Pending
Review via email: mp+203757@code.staging.launchpad.net

Commit message

Fix dependencies.tsv

Description of the change

Fix dependencies.tsv

godeps requires 4 fields per line. Though git doesn't have revnos,
a trailing tab is needed to define 4 fields.

https://codereview.appspot.com/58260044/

To post a comment you must log in.
Revision history for this message
Curtis Hovey (sinzui) wrote :

Reviewers: mp+203757_code.launchpad.net,

Message:
Please take a look.

Description:
Fix dependencies.tsv

godeps requires 4 fields per line. Though git doesn't have revnos,
a trailing tab is needed to define 4 fields.

https://code.launchpad.net/~sinzui/juju-core/deps-fix/+merge/203757

(do not edit description out of merge proposal)

Please review this at https://codereview.appspot.com/58260044/

Affected files (+3, -1 lines):
   A [revision details]
   M dependencies.tsv

Index: [revision details]
=== added file '[revision details]'
--- [revision details] 2012-01-01 00:00:00 +0000
+++ [revision details] 2012-01-01 00:00:00 +0000
@@ -0,0 +1,2 @@
+Old revision: tarmac-20140129115037-w8a0jr0f5gidb75s
+New revision: <email address hidden>

Index: dependencies.tsv
=== modified file 'dependencies.tsv'
--- dependencies.tsv 2014-01-28 05:02:02 +0000
+++ dependencies.tsv 2014-01-29 14:14:20 +0000
@@ -1,7 +1,7 @@
  code.google.com/p/go.crypto hg 6478cc9340cbbe6c04511280c5007722269108e9 184
  code.google.com/p/go.net hg 3591c18acabc99439c783463ef00e6dc277eee39 77
  labix.org/v2/mgo bzr <email address hidden>
248
-github.com/loggo/loggo git 89458b4dc99692bc24efe9c2252d7587f8dc247b
+github.com/loggo/loggo git 89458b4dc99692bc24efe9c2252d7587f8dc247b
  launchpad.net/gnuflag bzr
<email address hidden> 12
  launchpad.net/goamz bzr
<email address hidden> 44
  launchpad.net/gocheck bzr
<email address hidden> 85

Revision history for this message
Martin Packman (gz) wrote :

LGTM.

We should probably tolerate no trailing tab here, editors are
justifiably funny with trailing whitespace.

https://codereview.appspot.com/58260044/

Revision history for this message
Roger Peppe (rogpeppe) wrote :

LGTM
+1 to mgz's suggestion. i'll do that.

https://codereview.appspot.com/58260044/

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches

to status/vote changes: