Phrase can be preserved when the "add" step in "modify" is failed.

[jeffreyhc]

This will close #75 #109

When the "add" step is failed, the function will re-add the original phrase back.

This is my first pull request, wherever I can improve, please tell me.

[jserv]

Please improve your GIT commit messages.

[jserv]

The first line of GIT commit messages should be the summary of the change. Reference: http://chris.beams.io/posts/git-commit/

[jeffreyhc]

Thanks for your advice and reference, but I have some problem of the commit log... After I rewrite the commit log(use git rebase -i), I can't push new record to the master branch because of the diverged. Then I merge the record, and now the record becomes more complicated. Maybe I can re-post a new PR to solve this situation?

[Chocobo1]

I can't push new record to the master branch because of the diverged

use git push -f

Maybe I can re-post a new PR to solve this situation?

Please don't. And remove the Merge branch .... commit.

[jeffreyhc]

Sorry I don't know how to remove that commit, should I rebase to the fbe5896 then git push -f ?

Thanks for your advice.

[Chocobo1]

Sorry I don't know how to remove that commit,

search for "git remove commit". I'll let you learn on your own.

should I rebase to the fbe5896 then git push -f ?

rebase should be revert.

[jeffreyhc]

@Chocobo1 After I finish the edit, should I make a new commit or combine this to previous commit?

[Chocobo1]

@Chocobo1 After I finish the edit, should I make a new commit or combine this to previous commit?

just amend it.

[jserv]

@jeffreyhc : Can you rework the patch upon the review? Also, please read the article How to Write a Git Commit Message carefully.

[jeffreyhc]

@jserv : sorry I don't fully understand. I have modified the code other developers advised before, and referenced that article to write commit message. I think next I can study for the use frequency of userphrase in libchewing and try to integrate use frequency to the re-add userphrase mechanism. But for this commit, I have no idea what I can do further.

[jserv]

@jeffreyhc : I could not find the revised patch here. Ensure the submission of your changes.

[jeffreyhc]

@Chocobo1 Hi, I've undone the style change. Does there anything I need to correct?

[jserv]

@jeffreyhc The statement, "Repair the mechanism of modify phrase in UserphraseView", is meaningless. You should summarize the changes and motivation in the first line of GIT commit messages.

[jeffreyhc]

@jserv How about "Fix the modify mechanism by re-adding deleted phrase"

[jserv]

I would write down as following:

Reclaim the phrase during "add" manipulation

Close #75

[jeffreyhc]

Shall I still keep the body of the commit message? How about modify the message to:

Reclaim the phrase during "add" manipulation

Close #75

The phrase can be preserved when the "add" step in "modify" is failed. After a new phrase is added, the selection of the original phrase in chewing-editor seems to be reset, then the remove() in UserphaseView will lost the remove target. So I check the modified phrase add to the database successfully or not, If the adding is fail, then re-add the original phrase.

See also: #109

[jserv]

@jeffreyhc : Of course, you need message body as well. I will merge your contribution after you push the revised commit.

By the way, check this: https://help.github.com/articles/closing-issues-via-commit-messages/

[jserv]

@jeffreyhc : Separate subject from body with a blank line. Reference: http://chris.beams.io/posts/git-commit/

[jeffreyhc]

@jserv So my commit message should only one blank line between subject and body? I thought the content of body can also be separated by blank line

[coveralls]

Coverage remained the same at 94.382% when pulling 4f2dd9805868119dff8c2c7183b3e38c2b83ae1e on jeffreyhc:master into c987c8c9d93bbd186c62630312f46bed51bb7e2c on chewing:master.

[coveralls]

Coverage remained the same at 94.382% when pulling a075b6bfefa6007c3bd9b893478873ae3974afd2 on jeffreyhc:master into c987c8c9d93bbd186c62630312f46bed51bb7e2c on chewing:master.

[jserv]

@jeffreyhc : Thanks for your contribution!