Skip to content

Conversation

@dcramer
Copy link
Member

@dcramer dcramer commented Apr 5, 2016

Fixes GH-2804

This reverts commit ef9986a.

@getsentry/api

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm confused. Those two branches look the same to me.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ignore me. values_seen vs times_seen.

@dcramer dcramer force-pushed the fix-merge branch 2 times, most recently from 82a90a6 to 7ce72a4 Compare April 5, 2016 17:06
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I was going to do this, but to assert against the regression, we need different GroupTagKey objects with different keys.

@codecov-io
Copy link

Current coverage is 82.74%

Merging #2984 into master will decrease coverage by -0.41% as of 23503ec

@@            master   #2984   diff @@
======================================
  Files          920     920       
  Stmts        35958   35986    +28
  Branches         0       0       
  Methods          0               
======================================
- Hit          29901   29778   -123
  Partial          0       0       
- Missed        6057    6208   +151

Review entire Coverage Diff as of 23503ec


Uncovered Suggestions

  1. +0.07% via ...try/utils/apidocs.py#432...454
  2. +0.07% via ...try/utils/apidocs.py#117...139
  3. +0.06% via ...y/models/dsymfile.py#79...99
  4. See 7 more...

Powered by Codecov. Updated on successful CI builds.

@mattrobenolt
Copy link
Contributor

I'm commandeering this and adding more test cases to prevent a regression here again

@mattrobenolt mattrobenolt merged commit fb6acb4 into master Apr 5, 2016
@mattrobenolt mattrobenolt deleted the fix-merge branch April 5, 2016 20:01
mattrobenolt added a commit that referenced this pull request Apr 5, 2016
Handle GroupTagKey and GroupTagValue when merging issues

Conflicts:
	src/sentry/tasks/merge.py
	tests/sentry/tasks/test_merge.py
@github-actions github-actions bot locked and limited conversation to collaborators Dec 23, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

User count incorrect after merging events

5 participants