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

Evernote tests fixes #239

Closed
wants to merge 0 commits into from
Closed

Evernote tests fixes #239

wants to merge 0 commits into from

Conversation

jleclanche
Copy link
Member

More tests fixes cherrypicked from EN branch

@jleclanche
Copy link
Member Author

Ready to land now.

The tests cascaded into picking the ability to disable projects and translationprojects. I had to base myself on https://github.com/evernote/pootle/commit/a6b5dd9db6e6495444730d4e33b354315e86e967 which was absolutely atrocious to work with so I had to do my own commit so the commits are completely out of order.

This isn't ideal but it's readable at least, and ready to land (passes all tests).

@dwaynebailey
Copy link
Member

GTM

@julen
Copy link
Contributor

julen commented Apr 10, 2014

In case you're merging disabled project/TP states, it'd be worth also picking evernote/pootle@42e5011.

@jleclanche
Copy link
Member Author

@julen That was picked and squashed actually.

@jleclanche
Copy link
Member Author

Migration fixups and all done now.

@unho
Copy link
Member

unho commented Apr 10, 2014

Just some notes on the picking:

  • Avoid squashing commits as much as possible. Makes very difficult to know if a commit from a remote repository was picked or not.
  • I know sometimes it is hard to just cherry pick their commits as is, and I don't know if this is the case. But crafting some commits that actually have almost the same changes as some commit in the remote repository avoids crediting the original author and makes harder to notice that it is a picked change. At least you kept the original commit message which is good.
  • If you partially pick please prefix the commit message with "Partial pick:" while keeping the rest of the original commit message so it is easier to know what the original commit is. Of course a partial pick requires a note explaining the changes and why it was partially picked.

Other than that didn't saw obvious issues.

@jleclanche
Copy link
Member Author

Landed

@jleclanche jleclanche closed this Apr 14, 2014
@jleclanche jleclanche deleted the tests-fixes branch April 14, 2014 08:48
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants