diff options
| author | Amine <hilalyamine@gmail.com> | 2019-08-19 00:37:54 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-08-19 00:37:54 +0200 |
| commit | 36c91adddfc16b8c5d04eb66dbb4cf8c25cea321 (patch) | |
| tree | 50484f3531e33c2c63c026fcb1c76f60f8b13862 /entity/merge.go | |
| parent | 6428352bd14828f670206b60862de7f71c52d235 (diff) | |
| parent | e6931aaf6f3173c634b03d515287e4a12fd20f15 (diff) | |
| download | git-bug-36c91adddfc16b8c5d04eb66dbb4cf8c25cea321.tar.gz git-bug-36c91adddfc16b8c5d04eb66dbb4cf8c25cea321.zip | |
Merge pull request #190 from MichaelMure/bridge-ctx
Bridge: pull/push enhancements
Diffstat (limited to 'entity/merge.go')
| -rw-r--r-- | entity/merge.go | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/entity/merge.go b/entity/merge.go index 7c3e71c84..3ce8edac7 100644 --- a/entity/merge.go +++ b/entity/merge.go @@ -13,6 +13,7 @@ const ( MergeStatusInvalid MergeStatusUpdated MergeStatusNothing + MergeStatusError ) type MergeResult struct { @@ -39,6 +40,8 @@ func (mr MergeResult) String() string { return "updated" case MergeStatusNothing: return "nothing to do" + case MergeStatusError: + return fmt.Sprintf("merge error on %s: %s", mr.Id, mr.Err.Error()) default: panic("unknown merge status") } @@ -46,8 +49,9 @@ func (mr MergeResult) String() string { func NewMergeError(err error, id Id) MergeResult { return MergeResult{ - Err: err, - Id: id, + Err: err, + Id: id, + Status: MergeStatusError, } } |