Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add OneToOneFieldChecker #950

Closed

Conversation

Projects
None yet
4 participants
@jorgii
Copy link
Contributor

commented May 21, 2019

Solves #735

@codecov-io

This comment has been minimized.

Copy link

commented May 21, 2019

Codecov Report

Merging #950 into master will not change coverage.
The diff coverage is n/a.

Impacted file tree graph

@@           Coverage Diff           @@
##           master     #950   +/-   ##
=======================================
  Coverage   73.15%   73.15%           
=======================================
  Files         112      112           
  Lines        4764     4764           
  Branches      609      609           
=======================================
  Hits         3485     3485           
+ Misses       1057     1056    -1     
- Partials      222      223    +1
Impacted Files Coverage Δ
tcms/core/history.py 90.69% <0%> (ø) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 5289694...a53f018. Read the comment docs.

@coveralls

This comment has been minimized.

Copy link

commented May 21, 2019

Pull Request Test Coverage Report for Build 3256

  • 0 of 0 changed or added relevant lines in 0 files are covered.
  • No unchanged relevant lines lost coverage.
  • Overall coverage remained the same at 73.789%

Totals Coverage Status
Change from base Build 3254: 0.0%
Covered Lines: 3707
Relevant Lines: 4764

💛 - Coveralls
@atodorov
Copy link
Member

left a comment

Looks good, minor changes requested.

Also add Fixes #735 in commit log and GitHub will close the issue automatically.


name = 'one-to-one-field-checker'

msgs = {'E4493': ("Do not use OneToOneField",

This comment has been minimized.

Copy link
@atodorov

atodorov May 23, 2019

Member

Use R4531 for error code and I will merge after #949 is merged.

This comment has been minimized.

Copy link
@jorgii

jorgii May 28, 2019

Author Contributor

Fixed in 8a1c1cc

@atodorov

This comment has been minimized.

Copy link
Member

commented May 28, 2019

@jorgii can you rebase to latest master and resolve the conflicts and apply the minor changes requested so we can merge? Thanks.

@jorgii

This comment has been minimized.

Copy link
Contributor Author

commented May 28, 2019

@atodorov done.

@atodorov

This comment has been minimized.

Copy link
Member

commented May 28, 2019

@jorgii for some reason GH doesn't let me merge this. Try git rebase instead of git merge the latest master branch.

@jorgii

This comment has been minimized.

Copy link
Contributor Author

commented May 28, 2019

Rebase done

@atodorov

This comment has been minimized.

Copy link
Member

commented May 28, 2019

Rebase done

Definitely not done. Try this one:
https://www.atlassian.com/git/tutorials/merging-vs-rebasing

@jorgii

This comment has been minimized.

Copy link
Contributor Author

commented May 28, 2019

➜  Kiwi git:(features/add-one-to-one-field-checker) ✗ git rebase upstream/master
First, rewinding head to replay your work on top of it...
Applying: Add OneToOneFieldChecker
Using index info to reconstruct a base tree...
M	kiwi_lint/__init__.py
Falling back to patching base and 3-way merge...
Auto-merging kiwi_lint/__init__.py
CONFLICT (content): Merge conflict in kiwi_lint/__init__.py
error: Failed to merge in the changes.
Patch failed at 0001 Add OneToOneFieldChecker
hint: Use 'git am --show-current-patch' to see the failed patch
Resolve all conflicts manually, mark them as resolved with
"git add/rm <conflicted_files>", then run "git rebase --continue".
You can instead skip this commit: run "git rebase --skip".
To abort and get back to the state before "git rebase", run "git rebase --abort".
➜  Kiwi git:(52896943) ✗ git rebase --continue
Applying: Add OneToOneFieldChecker
Applying: Use R4531 code for one-to-one-field-checker.

That's how I did the rebase. Not really sure what went wrong.

@atodorov

This comment has been minimized.

Copy link
Member

commented May 28, 2019

That's how I did the rebase. Not really sure what went wrong.

Looks like you did not resolve the conflicts. At least I can't tell that you did so.

Try checking out your changes into another branch so you don't loose them. Then go back to the current feature branch, rebase to upstream/master and probably drop the commits which are not relevant/are duplicate.

@atodorov atodorov referenced this pull request Jun 6, 2019

Merged

Pr950 rebased and squashed #962

@atodorov

This comment has been minimized.

Copy link
Member

commented Jun 6, 2019

Cherry-picked, rebased and squashed as #962.

@atodorov atodorov closed this Jun 6, 2019

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.