Advertisement
Guest User

Untitled

a guest
Sep 12th, 2013
47
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 1.63 KB | None | 0 0
  1. Complete procedure -
  2.  
  3. openstack@os-dev:~/LOAD/tempest$ git review -d Ie707569f6948b0af0d5f7f861ea4c538fbba0060
  4. Creating a git remote called "gerrit" that maps to:
  5. ssh://raiesmh08@review.openstack.org:29418/openstack/tempest.git
  6. Downloading refs/changes/72/45372/4 from gerrit
  7. Switched to branch "review/mh_raies/port-negative-test"
  8.  
  9. openstack@os-dev:~/LOAD/tempest$ git review -d I6ab258ce8a14ad0a16befbbdb06d7abab62ad004
  10. Downloading refs/changes/30/45230/3 from gerrit
  11. Switched to branch "review/mh_raies/adding-support-for-network-load-balancer"
  12.  
  13. openstack@os-dev:~/LOAD/tempest$ git rebase -i review/mh_raies/port-negative-test
  14. error: could not apply 6aa512d... Bulk Subnets and Ports creation
  15.  
  16. When you have resolved this problem run "git rebase --continue".
  17. If you would prefer to skip this patch, instead run "git rebase --skip".
  18. To check out the original branch and stop rebasing run "git rebase --abort".
  19. Could not apply 6aa512d... Bulk Subnets and Ports creation
  20.  
  21. openstack@os-dev:~/LOAD/tempest$
  22.  
  23.  
  24.  
  25. during rebase file opened to save --
  26.  
  27.  
  28. pick 6aa512d Bulk Subnets and Ports creation
  29. pick 064da73 Network load balancer testing
  30.  
  31. # Rebase 72ca0b1..064da73 onto 72ca0b1
  32. #
  33. # Commands:
  34. # p, pick = use commit
  35. # r, reword = use commit, but edit the commit message
  36. # e, edit = use commit, but stop for amending
  37. # s, squash = use commit, but meld into previous commit
  38. # f, fixup = like "squash", but discard this commit's log message
  39. # x, exec = run command (the rest of the line) using shell
  40. #
  41. # If you remove a line here THAT COMMIT WILL BE LOST.
  42. # However, if you remove everything, the rebase will be aborted.
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement