API tools faq
paste
Advertisement
Guest User

Untitled

a guest
Nov 13th, 2015
108
0
Never
Add comment
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 8.52 KB | None | 0 0
raw download clone embed print report
  1. For interactive display:
  2. :x
  3.  
  4. L:\repo\ee-qa-websites\lrdcom>ant format-source
  5. Buildfile: L:\repo\ee-qa-websites\lrdcom\build.xml
  6. [copy] Copying 1 file to L:\repo\ee-qa-websites
  7.  
  8. format-source:
  9. [copy] Copying 434 files to L:\repo\master-portal\marketplaceWasHere
  10.  
  11. format-source:
  12. [java] Loading file:/L:/repo/master-portal/portal-impl/classes/system.properties
  13. [java] Loading file:/L:/repo/master-portal/portal-impl/classes/system-ext.properties
  14. [java] .\marketplaceWasHere\tests\osb\Marketplace\Marketplace.testcase
  15. [java] .\marketplaceWasHere\tests\osb\Registration\RegistrationDeveloper.testcase
  16. [copy] Copying 434 files to L:\repo\ee-qa-websites\lrdcom\test\functional\com\liferay\portalweb2
  17. [delete] Deleting directory L:\repo\master-portal\marketplaceWasHere
  18.  
  19. BUILD SUCCESSFUL
  20. Total time: 2 minutes 9 seconds
  21.  
  22. L:\repo\ee-qa-websites\lrdcom>git stash --list
  23. error: unknown option for 'stash save': --list
  24. To provide a message, use git stash save -- '--list'
  25. usage: git core\git-stash list [<options>]
  26. or: git core\git-stash show [<stash>]
  27. or: git core\git-stash drop [-q|--quiet] [<stash>]
  28. or: git core\git-stash ( pop | apply ) [--index] [-q|--quiet] [<stash>]
  29. or: git core\git-stash branch <branchname> [<stash>]
  30. or: git core\git-stash [save [--patch] [-k|--[no-]keep-index] [-q|--quiet]
  31. [-u|--include-untracked] [-a|--all] [<message>]]
  32. or: git core\git-stash clear
  33.  
  34. L:\repo\ee-qa-websites\lrdcom>git stash list
  35.  
  36. L:\repo\ee-qa-websites\lrdcom>git stash
  37. warning: LF will be replaced by CRLF in lrdcom/test/functional/com/liferay/portalweb2/tests/osb/Marketplace/Marketplace.testcase.
  38. The file will have its original line endings in your working directory.
  39. warning: LF will be replaced by CRLF in lrdcom/test/functional/com/liferay/portalweb2/tests/osb/Marketplace/Marketplace.testcase.
  40. The file will have its original line endings in your working directory.
  41. warning: LF will be replaced by CRLF in lrdcom/test/functional/com/liferay/portalweb2/tests/osb/Registration/RegistrationDeveloper.testcase.
  42. The file will have its original line endings in your working directory.
  43. Saved working directory and index state WIP on master-qa-19398: 8d8c03f LRQA-19398 Create RenewPaidDeveloperRegistration in testcase
  44. HEAD is now at 8d8c03f LRQA-19398 Create RenewPaidDeveloperRegistration in testcase
  45.  
  46. L:\repo\ee-qa-websites\lrdcom>git stash list
  47. stash@{0}: WIP on master-qa-19398: 8d8c03f LRQA-19398 Create RenewPaidDeveloperRegistration in testcase
  48.  
  49. L:\repo\ee-qa-websites\lrdcom>git branch
  50. master
  51. master-qa-19358
  52. * master-qa-19398
  53.  
  54. L:\repo\ee-qa-websites\lrdcom>git log -2
  55. commit 8d8c03f7ebd312ce2a3bf527a5a0a53bb3e462d3
  56. Author: Olivia Yu <olivia.yu@liferay.com>
  57. Date: Fri Nov 13 08:24:45 2015 -0800
  58.  
  59. LRQA-19398 Create RenewPaidDeveloperRegistration in testcase
  60.  
  61. commit 04fbf8c378c57ca27c431963f506a83be5ef5619
  62. Author: Olivia Yu <olivia.yu@liferay.com>
  63. Date: Fri Nov 13 08:24:26 2015 -0800
  64.  
  65. LRQA-19398 Add a check for whether individual already registered
  66.  
  67. L:\repo\ee-qa-websites\lrdcom>ant format-source
  68. Buildfile: L:\repo\ee-qa-websites\lrdcom\build.xml
  69.  
  70. format-source:
  71. [copy] Copying 434 files to L:\repo\master-portal\marketplaceWasHere
  72.  
  73. format-source:
  74. [java] Loading file:/L:/repo/master-portal/portal-impl/classes/system.properties
  75. [java] Loading file:/L:/repo/master-portal/portal-impl/classes/system-ext.properties
  76. [java] .\marketplaceWasHere\tests\osb\Marketplace\Marketplace.testcase
  77. [java] .\marketplaceWasHere\tests\osb\Registration\RegistrationDeveloper.testcase
  78. [copy] Copying 434 files to L:\repo\ee-qa-websites\lrdcom\test\functional\com\liferay\portalweb2
  79. [delete] Deleting directory L:\repo\master-portal\marketplaceWasHere
  80.  
  81. BUILD SUCCESSFUL
  82. Total time: 1 minute 14 seconds
  83.  
  84. L:\repo\ee-qa-websites\lrdcom>git rebase -i HEAD~1
  85. Stopped at 8d8c03f7ebd312ce2a3bf527a5a0a53bb3e462d3... LRQA-19398 Create RenewPaidDeveloperRegistration in testcase
  86. You can amend the commit now, with
  87.  
  88. git commit --amend
  89.  
  90. Once you are satisfied with your changes, run
  91.  
  92. git rebase --continue
  93.  
  94.  
  95. L:\repo\ee-qa-websites\lrdcom>git log -1
  96. commit 8d8c03f7ebd312ce2a3bf527a5a0a53bb3e462d3
  97. Author: Olivia Yu <olivia.yu@liferay.com>
  98. Date: Fri Nov 13 08:24:45 2015 -0800
  99.  
  100. LRQA-19398 Create RenewPaidDeveloperRegistration in testcase
  101.  
  102. L:\repo\ee-qa-websites\lrdcom>ant format-source
  103. Buildfile: L:\repo\ee-qa-websites\lrdcom\build.xml
  104.  
  105. format-source:
  106. [copy] Copying 434 files to L:\repo\master-portal\marketplaceWasHere
  107.  
  108. format-source:
  109. [java] Loading file:/L:/repo/master-portal/portal-impl/classes/system.properties
  110. [java] Loading file:/L:/repo/master-portal/portal-impl/classes/system-ext.properties
  111. [java] .\marketplaceWasHere\tests\osb\Marketplace\Marketplace.testcase
  112. [java] .\marketplaceWasHere\tests\osb\Registration\RegistrationDeveloper.testcase
  113. [copy] Copying 434 files to L:\repo\ee-qa-websites\lrdcom\test\functional\com\liferay\portalweb2
  114. [delete] Deleting directory L:\repo\master-portal\marketplaceWasHere
  115.  
  116. BUILD SUCCESSFUL
  117. Total time: 2 minutes 8 seconds
  118.  
  119. L:\repo\ee-qa-websites\lrdcom>git commit amend
  120. error: pathspec 'amend' did not match any file(s) known to git.
  121.  
  122. L:\repo\ee-qa-websites\lrdcom>git commit --amend
  123. warning: LF will be replaced by CRLF in lrdcom/test/functional/com/liferay/portalweb2/tests/osb/Registration/RegistrationDeveloper.testcase.
  124. The file will have its original line endings in your working directory.
  125. [detached HEAD warning: LF will be replaced by CRLF in lrdcom/test/functional/com/liferay/portalweb2/tests/osb/Registration/RegistrationDeveloper.testcase.
  126. The file will have its original line endings in your working directory.
  127. 434e99e] LRQA-19398 Create RenewPaidDeveloperRegistration in testcase
  128. warning: LF will be replaced by CRLF in lrdcom/test/functional/com/liferay/portalweb2/tests/osb/Registration/RegistrationDeveloper.testcase.
  129. The file will have its original line endings in your working directory.
  130. 1 file changed, 96 insertions(+)
  131.  
  132. L:\repo\ee-qa-websites\lrdcom>git rebase --continue
  133. lrdcom/build.xml: needs update
  134. lrdcom/test/functional/com/liferay/portalweb2/tests/osb/Marketplace/Marketplace.testcase: needs update
  135. You must edit all merge conflicts and then
  136. mark them as resolved using git add
  137.  
  138. L:\repo\ee-qa-websites\lrdcom>git rebase --continue
  139. Successfully rebased and updated refs/heads/master-qa-19398.
  140.  
  141. L:\repo\ee-qa-websites\lrdcom>git push origin master-qa-19398
  142. To git@github.com:oliv-yu/liferay-qa-websites-ee.git
  143. ! [rejected] master-qa-19398 -> master-qa-19398 (non-fast-forward)
  144. error: failed to push some refs to 'git@github.com:oliv-yu/liferay-qa-websites-ee.git'
  145. hint: Updates were rejected because the tip of your current branch is behind
  146. hint: its remote counterpart. Integrate the remote changes (e.g.
  147. hint: 'git pull ...') before pushing again.
  148. hint: See the 'Note about fast-forwards' in 'git push --help' for details.
  149.  
  150. L:\repo\ee-qa-websites\lrdcom>git push origin master-qa-19398 --f
  151. error: Ambiguous option: f (could be --force-with-lease or --follow-tags)
  152. usage: git push [<options>] [<repository> [<refspec>...]]
  153.  
  154. -v, --verbose be more verbose
  155. -q, --quiet be more quiet
  156. --repo <repository> repository
  157. --all push all refs
  158. --mirror mirror all refs
  159. --delete delete refs
  160. --tags push tags (can't be used with --all or --mirror)
  161. -n, --dry-run dry run
  162. --porcelain machine-readable output
  163. -f, --force force updates
  164. --force-with-lease[=<refname>:<expect>]
  165. require old value of ref to be at this value
  166. --recurse-submodules[=<check>]
  167. control recursive pushing of submodules
  168. --thin use thin pack
  169. --receive-pack <receive-pack>
  170. receive pack program
  171. --exec <receive-pack>
  172. receive pack program
  173. -u, --set-upstream set upstream for git pull/status
  174. --progress force progress reporting
  175. --prune prune locally removed refs
  176. --no-verify bypass pre-push hook
  177. --follow-tags push missing but relevant tags
  178.  
  179.  
  180. L:\repo\ee-qa-websites\lrdcom>git push origin master-qa-19398 --force
  181. Counting objects: 52, done.
  182. Delta compression using up to 8 threads.
  183. Compressing objects: 100% (8/8), done.
  184. Writing objects: 100% (12/12), 872 bytes | 0 bytes/s, done.
  185. Total 12 (delta 5), reused 0 (delta 0)
  186. To git@github.com:oliv-yu/liferay-qa-websites-ee.git
  187. + 8d8c03f...434e99e master-qa-19398 -> master-qa-19398 (forced update)
  188.  
  189. L:\repo\ee-qa-websites\lrdcom>
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement
Public Pastes
Advertisement
We use cookies for various purposes including analytics. By continuing to use Pastebin, you agree to our use of cookies as described in the Cookies Policy.  OK, I Understand
Not a member of Pastebin yet?
Sign Up, it unlocks many cool features!