D13203: Add Typewriter annotation tool in Okular

[Dileep Sankhla]

dileepsankhla added a comment.


  Hell! Sorry for this mistake again. Whenever I update the revision, I push the commit to the gsoc2018_typewriter branch too and the revision landed in need review state by that commit (both have the same hash).
  @ltoscano May you please reopen this revision?
  
  Should I push the commit to the gsoc branch or not? I usually update revision in this manner:
  
  1. `git branch`
  
  *gsoc2018_typewriter
  master
  
  2. `vim file.cpp`
  3. `git commit -m "msg"`
  4. `git checkout master`
  5. `git merge gsoc2018_typewriter`
  6. `arc diff --update D13203`
  
  It sends two new commit, one created in the gsoc branch and one at the point of merging to master branch
  
  7. `git reset --hard <Commit ID>`
  
  Here <Commit ID> is the last commit before merging gsoc2018_typewriter branch
  
  8. `git checkout gsoc2018_typewriter`
  9. `git push origin gsoc2018_typewriter`
  
  And finally, pushing the commit to origin/gsoc2018_typewriter branch.
  
  Can you suggest me where I'm wrong?

REPOSITORY
  R223 Okular

REVISION DETAIL
  https://phabricator.kde.org/D13203

To: dileepsankhla
Cc: ltoscano, ngraham, tobiasdeiminger, aacid, okular-devel
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.kde.org/pipermail/okular-devel/attachments/20180601/0ab44143/attachment.html>