API tools faq
paste
Advertisement
Guest User

Untitled

a guest
Aug 1st, 2018
321
0
Never
Add comment
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 89.67 KB | None | 0 0
raw download clone embed print report
  1. 14:59:11.360: [LMSSystem] git -c core.quotepath=false -c log.showSignature=false commit --only -F C:\Users\Anatoly\AppData\Local\Temp\git-commit-msg-.txt -- lms-core/src/main/resources/Resources/Resume/vocabularies/RusLastnameNeuterEnd.txt lms-core/src/main/resources/Resources/Resume/vocabularies/RusLastnameExclude.txt
  2. [release/4.6.18 5fc810abcd] PORTAL-43596 - [Familia] При импорте резюме фамилия распознается как Женщина
  3. 2 files changed, 3 insertions(+)
  4.  
  5. 14:59:18.535: [LMSSystem] git -c core.quotepath=false -c log.showSignature=false push --progress --porcelain origin refs/heads/release/4.6.18:release/4.6.18
  6. error: failed to push some refs to 'ssh://git@dev.mirapolis.ru:22022/LMSSystem'
  7. To ssh://dev.mirapolis.ru:22022/LMSSystem
  8. hint: Updates were rejected because the remote contains work that you do
  9. ! refs/heads/release/4.6.18:refs/heads/release/4.6.18 [rejected] (fetch first)
  10. Done
  11. hint: not have locally. This is usually caused by another repository pushing
  12. hint: to the same ref. You may want to first integrate the remote changes
  13. hint: (e.g., 'git pull ...') before pushing again.
  14. hint: See the 'Note about fast-forwards' in 'git push --help' for details.
  15. 14:59:22.745: [MiraFramework] git -c core.quotepath=false -c log.showSignature=false fetch origin --progress --prune
  16. 14:59:25.360: [LMSSystem] git -c core.quotepath=false -c log.showSignature=false fetch origin --progress --prune
  17. remote: Counting objects: 453, done.
  18. remote: Compressing objects: 100% (153/153), done.
  19. remote: Total 153 (delta 104), reused 0 (delta 0)
  20. Receiving objects: 100% (153/153), 44.89 KiB | 1.95 MiB/s, done.
  21. Resolving deltas: 100% (104/104), completed with 68 local objects.
  22. From ssh://dev.mirapolis.ru:22022/LMSSystem
  23. 7579c34b26..4000130619 release/4.6.18 -> origin/release/4.6.18
  24. f1ab4f0170..f4c82edfab develop -> origin/develop
  25. afe99a1210..0c1a29d8ff release/4.6.19 -> origin/release/4.6.19
  26. 9cd8253310..369e76fadd release/4.6.20 -> origin/release/4.6.20
  27. 14:59:30.096: [LMSSystem] git -c core.quotepath=false -c log.showSignature=false rebase origin/release/4.6.18
  28. First, rewinding head to replay your work on top of it...
  29. Applying: PORTAL-43596 - [Familia] При импорте резюме фамилия распознается как Женщина
  30. 14:59:33.349: [LMSSystem] git -c core.quotepath=false -c log.showSignature=false push --progress --porcelain origin refs/heads/release/4.6.18:release/4.6.18
  31. Counting objects: 11, done.
  32. Delta compression using up to 16 threads.
  33. Compressing objects: 100% (11/11), done.
  34. Writing objects: 100% (11/11), 1010 bytes | 505.00 KiB/s, done.
  35. Total 11 (delta 7), reused 0 (delta 0)
  36. remote: 2018-07-31 14:59:33,108 [MainThread ] [INFO ] Process push into branch refs/heads/release/4.6.18
  37. remote: 2018-07-31 14:59:33,109 [MainThread ] [DEBUG] /home/git/repositories/LMSSystem.git
  38. remote: 2018-07-31 14:59:33,134 [MainThread ] [DEBUG] git reset --hard
  39. remote: 2018-07-31 14:59:34,101 [MainThread ] [INFO ] HEAD is now at f4c82ed PORTAL-44255 - [Внутренний портал] Добавить на карточку Физического лица вкладку Подчиненные
  40. remote:
  41. remote: 2018-07-31 14:59:34,105 [MainThread ] [DEBUG] Last command result: 0
  42. remote: 2018-07-31 14:59:34,105 [MainThread ] [DEBUG] git checkout -q release/4.6.19
  43. remote: 2018-07-31 14:59:34,877 [MainThread ] [DEBUG] Last command result: 0
  44. remote: 2018-07-31 14:59:34,878 [MainThread ] [DEBUG] git reset --hard
  45. remote: 2018-07-31 14:59:35,754 [MainThread ] [INFO ] HEAD is now at 0c1a29d PORTAL-44834 - [TSUM] Оформление системы. Оформление полей для мобильного представления
  46. remote:
  47. remote: 2018-07-31 14:59:35,759 [MainThread ] [DEBUG] Last command result: 0
  48. remote: 2018-07-31 14:59:35,759 [MainThread ] [DEBUG] git branch -D release/4.6.19-merge-temp
  49. remote: 2018-07-31 14:59:35,764 [MainThread ] [INFO ] error: branch 'release/4.6.19-merge-temp' not found.
  50. remote:
  51. remote: 2018-07-31 14:59:35,765 [MainThread ] [DEBUG] Last command result: 1
  52. remote: 2018-07-31 14:59:35,765 [MainThread ] [DEBUG] git checkout -q -b release/4.6.19-merge-temp
  53. remote: 2018-07-31 14:59:36,561 [MainThread ] [DEBUG] Last command result: 0
  54. remote: 2018-07-31 14:59:36,578 [MainThread ] [DEBUG] git merge heads/release/4.6.18 -m 'PORTAL-43596 - [Familia] При импорте резюме фамилия распознается как Женщина
  55. remote: '
  56. remote: 2018-07-31 14:59:37,877 [MainThread ] [INFO ] Merge made by the 'recursive' strategy.
  57. remote:
  58. remote: 2018-07-31 14:59:37,882 [MainThread ] [INFO ] .../core/ca/integration/WorkAndPostManagerRecalculationTaskRoute.java | 4 ++--
  59. remote:
  60. remote: 2018-07-31 14:59:37,882 [MainThread ] [INFO ] .../resources/Resources/Resume/vocabularies/RusLastnameExclude.txt | 2 ++
  61. remote:
  62. remote: 2018-07-31 14:59:37,882 [MainThread ] [INFO ] .../resources/Resources/Resume/vocabularies/RusLastnameNeuterEnd.txt | 1 +
  63. remote:
  64. remote: 2018-07-31 14:59:37,883 [MainThread ] [INFO ] 3 files changed, 5 insertions(+), 2 deletions(-)
  65. remote:
  66. remote: 2018-07-31 14:59:37,889 [MainThread ] [DEBUG] Last command result: 0
  67. remote: 2018-07-31 14:59:37,889 [MainThread ] [DEBUG] git checkout -q release/4.6.19
  68. remote: 2018-07-31 14:59:38,480 [MainThread ] [DEBUG] Last command result: 0
  69. remote: 2018-07-31 14:59:38,481 [MainThread ] [DEBUG] git merge heads/release/4.6.19-merge-temp -m 'PORTAL-43596 - [Familia] При импорте резюме фамилия распознается как Женщина
  70. remote: '
  71. remote: 2018-07-31 14:59:39,139 [MainThread ] [INFO ] Updating 0c1a29d..a0c4ab8
  72. remote:
  73. remote: 2018-07-31 14:59:39,139 [MainThread ] [INFO ] Fast-forward (no commit created; -m option ignored)
  74. remote:
  75. remote: 2018-07-31 14:59:39,152 [MainThread ] [INFO ] .../core/ca/integration/WorkAndPostManagerRecalculationTaskRoute.java | 4 ++--
  76. remote:
  77. remote: 2018-07-31 14:59:39,152 [MainThread ] [INFO ] .../resources/Resources/Resume/vocabularies/RusLastnameExclude.txt | 2 ++
  78. remote:
  79. remote: 2018-07-31 14:59:39,152 [MainThread ] [INFO ] .../resources/Resources/Resume/vocabularies/RusLastnameNeuterEnd.txt | 1 +
  80. remote:
  81. remote: 2018-07-31 14:59:39,153 [MainThread ] [INFO ] 3 files changed, 5 insertions(+), 2 deletions(-)
  82. remote:
  83. remote: 2018-07-31 14:59:39,164 [MainThread ] [DEBUG] Last command result: 0
  84. remote: 2018-07-31 14:59:39,165 [MainThread ] [INFO ] MERGE release/4.6.18 -> release/4.6.19 [SUCCESS]
  85. remote: 2018-07-31 14:59:39,165 [MainThread ] [DEBUG] git checkout -q develop
  86. remote: 2018-07-31 14:59:40,127 [MainThread ] [DEBUG] Last command result: 0
  87. remote: 2018-07-31 14:59:40,127 [MainThread ] [DEBUG] git branch -D release/4.6.19-merge-temp
  88. remote: 2018-07-31 14:59:40,133 [MainThread ] [INFO ] Deleted branch release/4.6.19-merge-temp (was a0c4ab8).
  89. remote:
  90. remote: 2018-07-31 14:59:40,134 [MainThread ] [DEBUG] Last command result: 0
  91. remote: 2018-07-31 14:59:40,142 [MainThread ] [DEBUG] git reset --hard
  92. remote: 2018-07-31 14:59:40,844 [MainThread ] [INFO ] HEAD is now at f4c82ed PORTAL-44255 - [Внутренний портал] Добавить на карточку Физического лица вкладку Подчиненные
  93. remote:
  94. remote: 2018-07-31 14:59:40,850 [MainThread ] [DEBUG] Last command result: 0
  95. remote: 2018-07-31 14:59:40,850 [MainThread ] [DEBUG] git checkout -q release/4.6.20
  96. remote: 2018-07-31 14:59:41,619 [MainThread ] [DEBUG] Last command result: 0
  97. remote: 2018-07-31 14:59:41,620 [MainThread ] [DEBUG] git reset --hard
  98. remote: 2018-07-31 14:59:42,524 [MainThread ] [INFO ] HEAD is now at 369e76f PORTAL-44834 - [TSUM] Оформление системы. Оформление полей для мобильного представления
  99. remote:
  100. remote: 2018-07-31 14:59:42,529 [MainThread ] [DEBUG] Last command result: 0
  101. remote: 2018-07-31 14:59:42,529 [MainThread ] [DEBUG] git branch -D release/4.6.20-merge-temp
  102. remote: 2018-07-31 14:59:42,535 [MainThread ] [INFO ] error: branch 'release/4.6.20-merge-temp' not found.
  103. remote:
  104. remote: 2018-07-31 14:59:42,536 [MainThread ] [DEBUG] Last command result: 1
  105. remote: 2018-07-31 14:59:42,537 [MainThread ] [DEBUG] git checkout -q -b release/4.6.20-merge-temp
  106. remote: 2018-07-31 14:59:43,274 [MainThread ] [DEBUG] Last command result: 0
  107. remote: 2018-07-31 14:59:43,287 [MainThread ] [DEBUG] git merge heads/release/4.6.19 -m 'PORTAL-43596 - [Familia] При импорте резюме фамилия распознается как Женщина
  108. remote: '
  109. remote: 2018-07-31 14:59:44,517 [MainThread ] [INFO ] Merge made by the 'recursive' strategy.
  110. remote:
  111. remote: 2018-07-31 14:59:44,522 [MainThread ] [INFO ] .../core/ca/integration/WorkAndPostManagerRecalculationTaskRoute.java | 4 ++--
  112. remote:
  113. remote: 2018-07-31 14:59:44,523 [MainThread ] [INFO ] .../resources/Resources/Resume/vocabularies/RusLastnameExclude.txt | 2 ++
  114. remote:
  115. remote: 2018-07-31 14:59:44,523 [MainThread ] [INFO ] .../resources/Resources/Resume/vocabularies/RusLastnameNeuterEnd.txt | 1 +
  116. remote:
  117. remote: 2018-07-31 14:59:44,523 [MainThread ] [INFO ] 3 files changed, 5 insertions(+), 2 deletions(-)
  118. remote:
  119. remote: 2018-07-31 14:59:44,527 [MainThread ] [DEBUG] Last command result: 0
  120. remote: 2018-07-31 14:59:44,528 [MainThread ] [DEBUG] git checkout -q release/4.6.20
  121. remote: 2018-07-31 14:59:45,131 [MainThread ] [DEBUG] Last command result: 0
  122. remote: 2018-07-31 14:59:45,132 [MainThread ] [DEBUG] git merge heads/release/4.6.20-merge-temp -m 'PORTAL-43596 - [Familia] При импорте резюме фамилия распознается как Женщина
  123. remote: '
  124. remote: 2018-07-31 14:59:45,714 [MainThread ] [INFO ] Updating 369e76f..c6930c3
  125. remote:
  126. remote: 2018-07-31 14:59:45,715 [MainThread ] [INFO ] Fast-forward (no commit created; -m option ignored)
  127. remote:
  128. remote: 2018-07-31 14:59:45,721 [MainThread ] [INFO ] .../core/ca/integration/WorkAndPostManagerRecalculationTaskRoute.java | 4 ++--
  129. remote:
  130. remote: 2018-07-31 14:59:45,722 [MainThread ] [INFO ] .../resources/Resources/Resume/vocabularies/RusLastnameExclude.txt | 2 ++
  131. remote:
  132. remote: 2018-07-31 14:59:45,722 [MainThread ] [INFO ] .../resources/Resources/Resume/vocabularies/RusLastnameNeuterEnd.txt | 1 +
  133. remote:
  134. remote: 2018-07-31 14:59:45,722 [MainThread ] [INFO ] 3 files changed, 5 insertions(+), 2 deletions(-)
  135. remote:
  136. remote: 2018-07-31 14:59:45,727 [MainThread ] [DEBUG] Last command result: 0
  137. remote: 2018-07-31 14:59:45,728 [MainThread ] [INFO ] MERGE release/4.6.19 -> release/4.6.20 [SUCCESS]
  138. remote: 2018-07-31 14:59:45,728 [MainThread ] [DEBUG] git checkout -q develop
  139. remote: 2018-07-31 14:59:46,487 [MainThread ] [DEBUG] Last command result: 0
  140. remote: 2018-07-31 14:59:46,488 [MainThread ] [DEBUG] git branch -D release/4.6.20-merge-temp
  141. remote: 2018-07-31 14:59:46,494 [MainThread ] [INFO ] Deleted branch release/4.6.20-merge-temp (was c6930c3).
  142. remote:
  143. remote: 2018-07-31 14:59:46,494 [MainThread ] [DEBUG] Last command result: 0
  144. remote: 2018-07-31 14:59:46,504 [MainThread ] [DEBUG] git reset --hard
  145. remote: 2018-07-31 14:59:47,385 [MainThread ] [INFO ] HEAD is now at f4c82ed PORTAL-44255 - [Внутренний портал] Добавить на карточку Физического лица вкладку Подчиненные
  146. remote:
  147. remote: 2018-07-31 14:59:47,389 [MainThread ] [DEBUG] Last command result: 0
  148. remote: 2018-07-31 14:59:47,390 [MainThread ] [DEBUG] git checkout -q develop
  149. remote: 2018-07-31 14:59:47,965 [MainThread ] [DEBUG] Last command result: 0
  150. remote: 2018-07-31 14:59:47,965 [MainThread ] [DEBUG] git reset --hard
  151. remote: 2018-07-31 14:59:48,607 [MainThread ] [INFO ] HEAD is now at f4c82ed PORTAL-44255 - [Внутренний портал] Добавить на карточку Физического лица вкладку Подчиненные
  152. remote:
  153. remote: 2018-07-31 14:59:48,613 [MainThread ] [DEBUG] Last command result: 0
  154. remote: 2018-07-31 14:59:48,613 [MainThread ] [DEBUG] git branch -D develop-merge-temp
  155. remote: 2018-07-31 14:59:48,618 [MainThread ] [INFO ] error: branch 'develop-merge-temp' not found.
  156. remote:
  157. remote: 2018-07-31 14:59:48,619 [MainThread ] [DEBUG] Last command result: 1
  158. remote: 2018-07-31 14:59:48,619 [MainThread ] [DEBUG] git checkout -q -b develop-merge-temp
  159. remote: 2018-07-31 14:59:49,229 [MainThread ] [DEBUG] Last command result: 0
  160. remote: 2018-07-31 14:59:49,241 [MainThread ] [DEBUG] git merge heads/release/4.6.20 -m 'PORTAL-43596 - [Familia] При импорте резюме фамилия распознается как Женщина
  161. remote: '
  162. remote: 2018-07-31 14:59:50,385 [MainThread ] [INFO ] Merge made by the 'recursive' strategy.
  163. remote:
  164. remote: 2018-07-31 14:59:50,390 [MainThread ] [INFO ] .../core/ca/integration/WorkAndPostManagerRecalculationTaskRoute.java | 4 ++--
  165. remote:
  166. remote: 2018-07-31 14:59:50,390 [MainThread ] [INFO ] .../resources/Resources/Resume/vocabularies/RusLastnameExclude.txt | 2 ++
  167. remote:
  168. remote: 2018-07-31 14:59:50,391 [MainThread ] [INFO ] .../resources/Resources/Resume/vocabularies/RusLastnameNeuterEnd.txt | 1 +
  169. remote:
  170. remote: 2018-07-31 14:59:50,391 [MainThread ] [INFO ] 3 files changed, 5 insertions(+), 2 deletions(-)
  171. remote:
  172. remote: 2018-07-31 14:59:50,395 [MainThread ] [DEBUG] Last command result: 0
  173. remote: 2018-07-31 14:59:50,395 [MainThread ] [DEBUG] git checkout -q develop
  174. remote: 2018-07-31 14:59:50,944 [MainThread ] [DEBUG] Last command result: 0
  175. remote: 2018-07-31 14:59:50,944 [MainThread ] [DEBUG] git merge heads/develop-merge-temp -m 'PORTAL-43596 - [Familia] При импорте резюме фамилия распознается как Женщина
  176. remote: '
  177. remote: 2018-07-31 14:59:51,631 [MainThread ] [INFO ] Updating f4c82ed..e5bd761
  178. remote:
  179. remote: 2018-07-31 14:59:51,631 [MainThread ] [INFO ] Fast-forward (no commit created; -m option ignored)
  180. remote:
  181. remote: 2018-07-31 14:59:51,638 [MainThread ] [INFO ] .../core/ca/integration/WorkAndPostManagerRecalculationTaskRoute.java | 4 ++--
  182. remote:
  183. remote: 2018-07-31 14:59:51,639 [MainThread ] [INFO ] .../resources/Resources/Resume/vocabularies/RusLastnameExclude.txt | 2 ++
  184. remote:
  185. remote: 2018-07-31 14:59:51,639 [MainThread ] [INFO ] .../resources/Resources/Resume/vocabularies/RusLastnameNeuterEnd.txt | 1 +
  186. remote:
  187. remote: 2018-07-31 14:59:51,639 [MainThread ] [INFO ] 3 files changed, 5 insertions(+), 2 deletions(-)
  188. remote:
  189. remote: 2018-07-31 14:59:51,647 [MainThread ] [DEBUG] Last command result: 0
  190. remote: 2018-07-31 14:59:51,647 [MainThread ] [INFO ] MERGE release/4.6.20 -> develop [SUCCESS]
  191. remote: 2018-07-31 14:59:51,648 [MainThread ] [DEBUG] git checkout -q develop
  192. remote: 2018-07-31 14:59:52,301 [MainThread ] [DEBUG] Last command result: 0
  193. remote: 2018-07-31 14:59:52,301 [MainThread ] [DEBUG] git branch -D develop-merge-temp
  194. remote: 2018-07-31 14:59:52,307 [MainThread ] [INFO ] Deleted branch develop-merge-temp (was e5bd761).
  195. remote:
  196. remote: 2018-07-31 14:59:52,308 [MainThread ] [DEBUG] Last command result: 0
  197. To ssh://dev.mirapolis.ru:22022/LMSSystem
  198. refs/heads/release/4.6.18:refs/heads/release/4.6.18 4000130619..915de035a2
  199. Done
  200. 15:00:03.470: [MiraFramework] git -c core.quotepath=false -c log.showSignature=false fetch origin --progress --prune
  201. 15:00:05.940: [LMSSystem] git -c core.quotepath=false -c log.showSignature=false fetch origin --progress --prune
  202. remote: Counting objects: 83, done.
  203. remote: Compressing objects: 100% (33/33), done.
  204. remote: Total 33 (delta 21), reused 0 (delta 0)
  205. From ssh://dev.mirapolis.ru:22022/LMSSystem
  206. f4c82edfab..e5bd761822 develop -> origin/develop
  207. 0c1a29d8ff..a0c4ab8e09 release/4.6.19 -> origin/release/4.6.19
  208. 369e76fadd..c6930c310c release/4.6.20 -> origin/release/4.6.20
  209. 15:19:28.360: [MiraFramework] git -c core.quotepath=false -c log.showSignature=false checkout release/4.6.19 --
  210. Switched to branch 'release/4.6.19'
  211. Your branch is behind 'origin/release/4.6.19' by 45 commits, and can be fast-forwarded.
  212. (use "git pull" to update your local branch)
  213. 15:19:29.428: [LMSSystem] git -c core.quotepath=false -c log.showSignature=false checkout release/4.6.19 --
  214. Your branch is behind 'origin/release/4.6.19' by 186 commits, and can be fast-forwarded.
  215. Switched to branch 'release/4.6.19'
  216. (use "git pull" to update your local branch)
  217. 15:46:29.607: [MiraFramework] git -c core.quotepath=false -c log.showSignature=false checkout develop --
  218. Your branch is behind 'origin/develop' by 5 commits, and can be fast-forwarded.
  219. Switched to branch 'develop'
  220. (use "git pull" to update your local branch)
  221. 15:46:30.714: [LMSSystem] git -c core.quotepath=false -c log.showSignature=false checkout develop --
  222. Your branch is behind 'origin/develop' by 16 commits, and can be fast-forwarded.
  223. Switched to branch 'develop'
  224. (use "git pull" to update your local branch)
  225. 15:51:17.200: [MiraFramework] git -c core.quotepath=false -c log.showSignature=false fetch origin --progress --prune
  226. 15:51:20.473: [LMSSystem] git -c core.quotepath=false -c log.showSignature=false fetch origin --progress --prune
  227. remote: Counting objects: 419, done.
  228. remote: Compressing objects: 100% (132/132), done.
  229. remote: Total 135 (delta 95), reused 0 (delta 0)
  230. Receiving objects: 100% (135/135), 12.68 KiB | 1.15 MiB/s, done.
  231. Resolving deltas: 100% (95/95), completed with 54 local objects.
  232. From ssh://dev.mirapolis.ru:22022/LMSSystem
  233. e5bd761822..22b4f9e26f develop -> origin/develop
  234. 724858ad2e..b6823b23b2 feature/PORTAL-44168 -> origin/feature/PORTAL-44168
  235. 915de035a2..0a153ccb6e release/4.6.18 -> origin/release/4.6.18
  236. a0c4ab8e09..0f8a912b5b release/4.6.19 -> origin/release/4.6.19
  237. c6930c310c..8c536308a5 release/4.6.20 -> origin/release/4.6.20
  238. 15:51:25.937: [MiraFramework] git -c core.quotepath=false -c log.showSignature=false rebase origin/develop
  239. First, rewinding head to replay your work on top of it...
  240. Fast-forwarded develop to origin/develop.
  241. 15:51:28.153: [LMSSystem] git -c core.quotepath=false -c log.showSignature=false rebase origin/develop
  242. First, rewinding head to replay your work on top of it...
  243. Fast-forwarded develop to origin/develop.
  244. 16:03:58.649: [LMSSystem] git -c core.quotepath=false -c log.showSignature=false commit --only -F C:\Users\Anatoly\AppData\Local\Temp\git-commit-msg-.txt -- lms-core/src/main/java/ext/report/Report41656.java
  245. [develop 44e24316c9] PORTAL-44819 - [Почта России] В отчете "Преднаполненный шаблон для присвоения льгот НПО" доработать принцип поиска физических лиц и расчет параметра "Дата вступления в программу".
  246. 1 file changed, 10 insertions(+), 5 deletions(-)
  247.  
  248. 16:04:02.648: [LMSSystem] git -c core.quotepath=false -c log.showSignature=false push --progress --porcelain origin refs/heads/develop:develop
  249. Counting objects: 9, done.
  250. Delta compression using up to 16 threads.
  251. Compressing objects: 100% (9/9), done.
  252. Writing objects: 100% (9/9), 1.20 KiB | 1.21 MiB/s, done.
  253. Total 9 (delta 5), reused 0 (delta 0)
  254. remote: 2018-07-31 16:04:02,678 [MainThread ] [INFO ] Process push into branch refs/heads/develop
  255. To ssh://dev.mirapolis.ru:22022/LMSSystem
  256. refs/heads/develop:refs/heads/develop 22b4f9e26f..44e24316c9
  257. Done
  258. 16:18:29.810: [MiraFramework] git -c core.quotepath=false -c log.showSignature=false commit --only -F C:\Users\Anatoly\AppData\Local\Temp\git-commit-msg-.txt -- mirafw-service/src/main/java/org/mirapolis/util/CollectionUtils.java mirafw-service/src/main/java/org/mirapolis/util/DateHelper.java
  259. [develop 8f73f2950] PORTAL-44819 - [Почта России] В отчете "Преднаполненный шаблон для присвоения льгот НПО" доработать принцип поиска физических лиц и расчет параметра "Дата вступления в программу".
  260. 2 files changed, 27 insertions(+), 2 deletions(-)
  261.  
  262. 16:18:30.482: [LMSSystem] git -c core.quotepath=false -c log.showSignature=false commit --only -F C:\Users\Anatoly\AppData\Local\Temp\git-commit-msg-.txt -- lms-core/src/main/java/ext/report/Report41656.java
  263. [develop 19d436b043] PORTAL-44819 - [Почта России] В отчете "Преднаполненный шаблон для присвоения льгот НПО" доработать принцип поиска физических лиц и расчет параметра "Дата вступления в программу".
  264. 1 file changed, 2 insertions(+), 7 deletions(-)
  265.  
  266. 16:18:34.837: [MiraFramework] git -c core.quotepath=false -c log.showSignature=false push --progress --porcelain origin refs/heads/develop:develop
  267. Counting objects: 11, done.
  268. Delta compression using up to 16 threads.
  269. Compressing objects: 100% (11/11), done.
  270. Writing objects: 100% (11/11), 1.45 KiB | 745.00 KiB/s, done.
  271. Total 11 (delta 5), reused 0 (delta 0)
  272. remote: 2018-07-31 16:18:34,573 [MainThread ] [INFO ] Process push into branch refs/heads/develop
  273. To ssh://dev.mirapolis.ru:22022/MiraFramework
  274. refs/heads/develop:refs/heads/develop 58cf1f2bc..8f73f2950
  275. Done
  276. 16:18:38.259: [LMSSystem] git -c core.quotepath=false -c log.showSignature=false push --progress --porcelain origin refs/heads/develop:develop
  277. Counting objects: 9, done.
  278. Delta compression using up to 16 threads.
  279. Compressing objects: 100% (9/9), done.
  280. Writing objects: 100% (9/9), 992 bytes | 992.00 KiB/s, done.
  281. Total 9 (delta 5), reused 0 (delta 0)
  282. remote: 2018-07-31 16:18:37,887 [MainThread ] [INFO ] Process push into branch refs/heads/develop
  283. To ssh://dev.mirapolis.ru:22022/LMSSystem
  284. refs/heads/develop:refs/heads/develop 44e24316c9..19d436b043
  285. Done
  286. 16:37:06.561: [LMSSystem] git -c core.quotepath=false -c log.showSignature=false commit --only -F C:\Users\Anatoly\AppData\Local\Temp\git-commit-msg-.txt -- lms-core/src/main/java/ext/report/Report42871.java
  287. [develop 812979fae8] PORTAL-43820 - [Почта России] Доработать сводный отчет "Общий отчет по текущему периоду".
  288. 1 file changed, 13 insertions(+), 13 deletions(-)
  289.  
  290. 16:37:13.176: [LMSSystem] git -c core.quotepath=false -c log.showSignature=false push --progress --porcelain origin refs/heads/develop:develop
  291. Counting objects: 9, done.
  292. Delta compression using up to 16 threads.
  293. Compressing objects: 100% (9/9), done.
  294. Writing objects: 100% (9/9), 1.01 KiB | 516.00 KiB/s, done.
  295. Total 9 (delta 5), reused 0 (delta 0)
  296. remote: 2018-07-31 16:37:13,075 [MainThread ] [INFO ] Process push into branch refs/heads/develop
  297. To ssh://dev.mirapolis.ru:22022/LMSSystem
  298. refs/heads/develop:refs/heads/develop 19d436b043..812979fae8
  299. Done
  300. 16:55:08.183: [MiraFramework] git -c core.quotepath=false -c log.showSignature=false checkout release/4.6.18 --
  301. Switched to branch 'release/4.6.18'
  302. Your branch is up to date with 'origin/release/4.6.18'.
  303. 16:55:09.306: [LMSSystem] git -c core.quotepath=false -c log.showSignature=false checkout release/4.6.18 --
  304. Your branch is behind 'origin/release/4.6.18' by 1 commit, and can be fast-forwarded.
  305. Switched to branch 'release/4.6.18'
  306. (use "git pull" to update your local branch)
  307. 16:56:42.248: [MiraFramework] git -c core.quotepath=false -c log.showSignature=false fetch origin --progress --prune
  308. 16:56:44.715: [LMSSystem] git -c core.quotepath=false -c log.showSignature=false fetch origin --progress --prune
  309. remote: Counting objects: 135, done.
  310. remote: Compressing objects: 100% (40/40), done.
  311. remote: Total 40 (delta 18), reused 0 (delta 0)
  312. From ssh://dev.mirapolis.ru:22022/LMSSystem
  313. 0a153ccb6e..89e77734fc release/4.6.18 -> origin/release/4.6.18
  314. 0f8a912b5b..516f1e119e release/4.6.19 -> origin/release/4.6.19
  315. 8c536308a5..59e01467b2 release/4.6.20 -> origin/release/4.6.20
  316. 16:56:49.027: [LMSSystem] git -c core.quotepath=false -c log.showSignature=false rebase origin/release/4.6.18
  317. First, rewinding head to replay your work on top of it...
  318. Fast-forwarded release/4.6.18 to origin/release/4.6.18.
  319. 17:01:49.334: [MiraFramework] git -c core.quotepath=false -c log.showSignature=false checkout develop --
  320. Switched to branch 'develop'
  321. Your branch is up to date with 'origin/develop'.
  322. 17:01:50.435: [LMSSystem] git -c core.quotepath=false -c log.showSignature=false checkout develop --
  323. Your branch is up to date with 'origin/develop'.
  324. Switched to branch 'develop'
  325. 17:02:04.075: [MiraFramework] git -c core.quotepath=false -c log.showSignature=false fetch origin --progress --prune
  326. 17:02:06.420: [LMSSystem] git -c core.quotepath=false -c log.showSignature=false fetch origin --progress --prune
  327. 17:04:29.889: [LMSSystem] git -c core.quotepath=false -c log.showSignature=false commit --only -F C:\Users\Anatoly\AppData\Local\Temp\git-commit-msg-.txt -- lms-core/src/main/java/ext/report/Report42871.java
  328. [develop 14fd03e3b1] PORTAL-43820 - [Почта России] Доработать сводный отчет "Общий отчет по текущему периоду".
  329. 1 file changed, 2 insertions(+), 2 deletions(-)
  330.  
  331. 17:04:34.341: [LMSSystem] git -c core.quotepath=false -c log.showSignature=false push --progress --porcelain origin refs/heads/develop:develop
  332. Counting objects: 9, done.
  333. Delta compression using up to 16 threads.
  334. Compressing objects: 100% (9/9), done.
  335. Writing objects: 100% (9/9), 882 bytes | 882.00 KiB/s, done.
  336. Total 9 (delta 5), reused 0 (delta 0)
  337. remote: 2018-07-31 17:04:34,640 [MainThread ] [INFO ] Process push into branch refs/heads/develop
  338. To ssh://dev.mirapolis.ru:22022/LMSSystem
  339. refs/heads/develop:refs/heads/develop 812979fae8..14fd03e3b1
  340. Done
  341. 17:04:48.488: [MiraFramework] git -c core.quotepath=false -c log.showSignature=false checkout release/4.6.18 --
  342. Switched to branch 'release/4.6.18'
  343. Your branch is up to date with 'origin/release/4.6.18'.
  344. 17:04:49.455: [LMSSystem] git -c core.quotepath=false -c log.showSignature=false checkout release/4.6.18 --
  345. Switched to branch 'release/4.6.18'
  346. Your branch is up to date with 'origin/release/4.6.18'.
  347. 17:19:21.771: [MiraFramework] git -c core.quotepath=false -c log.showSignature=false fetch origin --progress --prune
  348. 17:19:24.373: [LMSSystem] git -c core.quotepath=false -c log.showSignature=false fetch origin --progress --prune
  349. 17:22:40.681: [MiraFramework] git -c core.quotepath=false -c log.showSignature=false fetch origin --progress --prune
  350. 17:22:43.022: [LMSSystem] git -c core.quotepath=false -c log.showSignature=false fetch origin --progress --prune
  351. 17:29:57.671: [MiraFramework] git -c core.quotepath=false -c log.showSignature=false checkout develop --
  352. Switched to branch 'develop'
  353. Your branch is up to date with 'origin/develop'.
  354. 17:29:58.829: [LMSSystem] git -c core.quotepath=false -c log.showSignature=false checkout develop --
  355. Your branch is up to date with 'origin/develop'.
  356. Switched to branch 'develop'
  357. 17:33:26.813: [LMSSystem] git -c core.quotepath=false -c log.showSignature=false commit --only -F C:\Users\Anatoly\AppData\Local\Temp\git-commit-msg-.txt -- lms-core/src/main/java/ext/report/Report42871.java
  358. [develop 7b07aa9f2a] PORTAL-42871 - [Почта России] Разработать сводный отчет "Общий отчет по текущему периоду".
  359. 1 file changed, 2 insertions(+), 2 deletions(-)
  360.  
  361. 17:33:32.401: [LMSSystem] git -c core.quotepath=false -c log.showSignature=false push --progress --porcelain origin refs/heads/develop:develop
  362. error: failed to push some refs to 'ssh://git@dev.mirapolis.ru:22022/LMSSystem'
  363. To ssh://dev.mirapolis.ru:22022/LMSSystem
  364. ! refs/heads/develop:refs/heads/develop [rejected] (fetch first)
  365. hint: Updates were rejected because the remote contains work that you do
  366. Done
  367. hint: not have locally. This is usually caused by another repository pushing
  368. hint: to the same ref. You may want to first integrate the remote changes
  369. hint: (e.g., 'git pull ...') before pushing again.
  370. hint: See the 'Note about fast-forwards' in 'git push --help' for details.
  371. 17:33:35.193: [MiraFramework] git -c core.quotepath=false -c log.showSignature=false fetch origin --progress --prune
  372. 17:33:37.721: [LMSSystem] git -c core.quotepath=false -c log.showSignature=false fetch origin --progress --prune
  373. remote: Counting objects: 295, done.
  374. remote: Compressing objects: 100% (80/80), done.
  375. remote: Total 80 (delta 60), reused 0 (delta 0)
  376. From ssh://dev.mirapolis.ru:22022/LMSSystem
  377. 14fd03e3b1..76666c1c3a develop -> origin/develop
  378. 89e77734fc..9e2da1b801 release/4.6.18 -> origin/release/4.6.18
  379. 516f1e119e..afde9d5eaa release/4.6.19 -> origin/release/4.6.19
  380. 59e01467b2..680c0967bd release/4.6.20 -> origin/release/4.6.20
  381. 17:33:42.642: [LMSSystem] git -c core.quotepath=false -c log.showSignature=false rebase origin/develop
  382. First, rewinding head to replay your work on top of it...
  383. Applying: PORTAL-42871 - [Почта России] Разработать сводный отчет "Общий отчет по текущему периоду".
  384. 17:33:46.312: [LMSSystem] git -c core.quotepath=false -c log.showSignature=false push --progress --porcelain origin refs/heads/develop:develop
  385. Counting objects: 9, done.
  386. Delta compression using up to 16 threads.
  387. Compressing objects: 100% (9/9), done.
  388. Writing objects: 100% (9/9), 903 bytes | 903.00 KiB/s, done.
  389. Total 9 (delta 5), reused 0 (delta 0)
  390. remote: 2018-07-31 17:33:46,032 [MainThread ] [INFO ] Process push into branch refs/heads/develop
  391. To ssh://dev.mirapolis.ru:22022/LMSSystem
  392. refs/heads/develop:refs/heads/develop 76666c1c3a..01a1e849f2
  393. Done
  394. 17:35:35.555: [MiraFramework] git -c core.quotepath=false -c log.showSignature=false checkout release/4.6.18 --
  395. Switched to branch 'release/4.6.18'
  396. Your branch is up to date with 'origin/release/4.6.18'.
  397. 17:35:36.688: [LMSSystem] git -c core.quotepath=false -c log.showSignature=false checkout release/4.6.18 --
  398. Your branch is behind 'origin/release/4.6.18' by 1 commit, and can be fast-forwarded.
  399. Switched to branch 'release/4.6.18'
  400. (use "git pull" to update your local branch)
  401. 18:03:54.072: [LMSSystem] git -c core.quotepath=false -c log.showSignature=false add --ignore-errors -- lms-core/src/main/java/ext/report/TestReport.java
  402. 18:10:20.958: [LMSSystem] git -c core.quotepath=false -c log.showSignature=false rm --ignore-unmatch --cached -- lms-core/src/main/java/ext/report/TestReport.java
  403. 18:10:49.038: [MiraFramework] git -c core.quotepath=false -c log.showSignature=false checkout develop --
  404. Switched to branch 'develop'
  405. Your branch is up to date with 'origin/develop'.
  406. 18:10:50.028: [LMSSystem] git -c core.quotepath=false -c log.showSignature=false checkout develop --
  407. Your branch is up to date with 'origin/develop'.
  408. Switched to branch 'develop'
  409. 18:16:31.665: [MiraFramework] git -c core.quotepath=false -c log.showSignature=false fetch origin --progress --prune
  410. 18:16:34.385: [LMSSystem] git -c core.quotepath=false -c log.showSignature=false fetch origin --progress --prune
  411. remote: Counting objects: 74, done.
  412. remote: Compressing objects: 100% (26/26), done.
  413. remote: Total 26 (delta 20), reused 0 (delta 0)
  414. From ssh://dev.mirapolis.ru:22022/LMSSystem
  415. 01a1e849f2..e4f7d41cdc develop -> origin/develop
  416. 18:16:38.287: [LMSSystem] git -c core.quotepath=false -c log.showSignature=false rebase origin/develop
  417. First, rewinding head to replay your work on top of it...
  418. Fast-forwarded develop to origin/develop.
  419. 18:55:34.337: [LMSSystem] git -c core.quotepath=false -c log.showSignature=false commit --only -F C:\Users\Anatoly\AppData\Local\Temp\git-commit-msg-.txt -- lms-core/src/main/resources/Resources/MessageBundles/hrIntegration_ru.properties lms-core/src/main/java/hr/integration/HRIntegrationSiteValueService.java
  420. [develop ec285f6085] PORTAL-44469 - Изменить текст ошибки при недействительных данных авторизации на работном сайте
  421. 2 files changed, 2 insertions(+), 2 deletions(-)
  422.  
  423. 18:55:39.513: [LMSSystem] git -c core.quotepath=false -c log.showSignature=false push --progress --porcelain origin refs/heads/develop:develop
  424. Counting objects: 13, done.
  425. Delta compression using up to 16 threads.
  426. Compressing objects: 100% (13/13), done.
  427. Writing objects: 100% (13/13), 1.08 KiB | 555.00 KiB/s, done.
  428. Total 13 (delta 9), reused 0 (delta 0)
  429. remote: 2018-07-31 18:55:39,975 [MainThread ] [INFO ] Process push into branch refs/heads/develop
  430. To ssh://dev.mirapolis.ru:22022/LMSSystem
  431. refs/heads/develop:refs/heads/develop e4f7d41cdc..ec285f6085
  432. Done
  433. 19:37:33.716: [LMSSystem] git -c core.quotepath=false -c log.showSignature=false commit --only -F C:\Users\Anatoly\AppData\Local\Temp\git-commit-msg-.txt -- lms-core/src/main/java/mira/event/notification/FinishEventNotificationType.java lms-core/src/main/java/mira/event/notification/AbstractEventTimeNotificationType.java lms-core/src/main/java/mira/event/notification/CreateEventNotificationType.java lms-core/src/main/java/mira/event/notification/ExceedDeadlineEventNotificationType.java lms-core/src/main/java/mira/event/notification/AbstractEventNotificationType.java lms-core/src/main/java/hr/candidate/resume/CandidateResumeDao.java
  434. [develop 0efd7a996a] PORTAL-44274 - [Почта] При массовом создании событий подбора прикладывать файл резюме к уведомлению, если включена соответствующая настройка на карточке уведомления
  435. 6 files changed, 66 insertions(+), 40 deletions(-)
  436.  
  437. 19:37:38.755: [LMSSystem] git -c core.quotepath=false -c log.showSignature=false push --progress --porcelain origin refs/heads/develop:develop
  438. Counting objects: 18, done.
  439. Delta compression using up to 16 threads.
  440. Compressing objects: 100% (18/18), done.
  441. Writing objects: 100% (18/18), 7.28 KiB | 2.43 MiB/s, done.
  442. Total 18 (delta 10), reused 0 (delta 0)
  443. remote: 2018-07-31 19:37:38,696 [MainThread ] [INFO ] Process push into branch refs/heads/develop
  444. To ssh://dev.mirapolis.ru:22022/LMSSystem
  445. refs/heads/develop:refs/heads/develop ec285f6085..0efd7a996a
  446. Done
  447. 00:33:01.658: [LMSSystem] git -c core.quotepath=false -c log.showSignature=false commit --only -F C:\Users\Anatoly\AppData\Local\Temp\git-commit-msg-.txt -- lms-core/src/main/java/mira/event/notification/CreateEventNotificationType.java
  448. [develop 32531174a8] PORTAL-44274 - [Почта] При массовом создании событий подбора прикладывать файл резюме к уведомлению, если включена соответствующая настройка на карточке уведомления
  449. 1 file changed, 4 deletions(-)
  450.  
  451. 00:33:10.602: [LMSSystem] git -c core.quotepath=false -c log.showSignature=false push --progress --porcelain origin refs/heads/develop:develop
  452. To ssh://dev.mirapolis.ru:22022/LMSSystem
  453. error: failed to push some refs to 'ssh://git@dev.mirapolis.ru:22022/LMSSystem'
  454. hint: Updates were rejected because the remote contains work that you do
  455. ! refs/heads/develop:refs/heads/develop [rejected] (fetch first)
  456. Done
  457. hint: not have locally. This is usually caused by another repository pushing
  458. hint: to the same ref. You may want to first integrate the remote changes
  459. hint: (e.g., 'git pull ...') before pushing again.
  460. hint: See the 'Note about fast-forwards' in 'git push --help' for details.
  461. 00:33:14.224: [MiraFramework] git -c core.quotepath=false -c log.showSignature=false fetch origin --progress --prune
  462. 00:33:17.395: [LMSSystem] git -c core.quotepath=false -c log.showSignature=false fetch origin --progress --prune
  463. remote: Counting objects: 257, done.
  464. remote: Compressing objects: 100% (59/59), done.
  465. remote: Total 59 (delta 37), reused 0 (delta 0)
  466. From ssh://dev.mirapolis.ru:22022/LMSSystem
  467. 0efd7a996a..3e310abe2e develop -> origin/develop
  468. 9e2da1b801..18661e60df release/4.6.18 -> origin/release/4.6.18
  469. afde9d5eaa..ce5724ea56 release/4.6.19 -> origin/release/4.6.19
  470. 680c0967bd..299dda6257 release/4.6.20 -> origin/release/4.6.20
  471. 00:33:22.413: [LMSSystem] git -c core.quotepath=false -c log.showSignature=false rebase origin/develop
  472. First, rewinding head to replay your work on top of it...
  473. Applying: PORTAL-44274 - [Почта] При массовом создании событий подбора прикладывать файл резюме к уведомлению, если включена соответствующая настройка на карточке уведомления
  474. 00:33:26.143: [LMSSystem] git -c core.quotepath=false -c log.showSignature=false push --progress --porcelain origin refs/heads/develop:develop
  475. Counting objects: 10, done.
  476. Delta compression using up to 16 threads.
  477. Compressing objects: 100% (10/10), done.
  478. Writing objects: 100% (10/10), 991 bytes | 991.00 KiB/s, done.
  479. Total 10 (delta 6), reused 0 (delta 0)
  480. remote: 2018-08-01 00:33:29,176 [MainThread ] [INFO ] Process push into branch refs/heads/develop
  481. To ssh://dev.mirapolis.ru:22022/LMSSystem
  482. refs/heads/develop:refs/heads/develop 3e310abe2e..1fe0c64e28
  483. Done
  484. 11:11:18.723: [LMSSystem] git -c core.quotepath=false -c log.showSignature=false add --ignore-errors -- lms-core/src/main/java/mira/fieldgridfilter/customfilter/PersonWithSameAttributeValuesFilter.java
  485. 11:11:46.684: [LMSSystem] git -c core.quotepath=false -c log.showSignature=false rm --ignore-unmatch --cached -- lms-core/src/main/java/mira/fieldgridfilter/customfilter/PersonWithSameAttributeValuesFilter.java
  486. 11:11:46.929: [LMSSystem] git -c core.quotepath=false -c log.showSignature=false add --ignore-errors -- lms-core/src/main/java/mira/fieldgridfilter/customfilter/CurrentUserAttributesSameValuesFilter.java
  487. 13:07:29.243: [LMSSystem] git -c core.quotepath=false -c log.showSignature=false add --ignore-errors -- lms-core/src/main/java/lms/core/person/datasourcemodel/CurrentPersonAttributeValuesDataSourceModel.java
  488. 14:19:05.119: [LMSSystem] git -c core.quotepath=false -c log.showSignature=false rm --cached -f -- lms-core/src/main/java/lms/core/measure/MeasureAccessLevelDataSourceModel.java lms-core/src/main/java/lms/core/person/PersonMessage.java lms-core/src/main/resources/Resources/MessageBundles/Person_ru.properties
  489. 14:19:05.339: [MiraFramework] git -c core.quotepath=false -c log.showSignature=false rm --cached -f -- mirafw-core/src/main/java/org/mirapolis/mvc/view/element/component/datamodel/bean/DataModelBeanTableProvider.java mirafw-core/src/main/java/org/mirapolis/mvc/view/element/component/datamodel/common/DataModelTableProvider.java mirafw-core/src/main/java/org/mirapolis/mvc/view/element/component/datamodel/dataobject/dataobjectmodel/DataObjectDataSourceModelProvider.java mirafw-core/src/main/java/org/mirapolis/mvc/view/element/component/datamodel/dataobject/dataobjectmodel/DataSourceModel.java mirafw-core/src/main/java/org/mirapolis/mvc/view/element/component/datamodel/dataobject/dataobjectmodel/VirtualDataSourceModel.java mirafw-core/src/main/java/org/mirapolis/mvc/view/element/component/datamodel/datasource/DataModelDataSource.java mirafw-core/src/main/java/org/mirapolis/mvc/view/element/component/datamodel/filter/DataModelFilter.java
  490. 14:19:05.489: [LMSSystem] git -c core.quotepath=false -c log.showSignature=false rm --cached -f -- lms-core/src/main/java/lms/core/person/datasourcemodel/CurrentPersonAttributeValuesDataSourceModel.java lms-core/src/main/java/mira/fieldgridfilter/customfilter/CurrentUserAttributesSameValuesFilter.java
  491. 14:19:05.707: [LMSSystem] git -c core.quotepath=false -c log.showSignature=false checkout HEAD -- lms-core/src/main/java/lms/core/measure/MeasureAccessLevelDataSourceModel.java lms-core/src/main/java/lms/core/person/PersonMessage.java lms-core/src/main/resources/Resources/MessageBundles/Person_ru.properties
  492. 14:19:05.971: [MiraFramework] git -c core.quotepath=false -c log.showSignature=false checkout HEAD -- mirafw-core/src/main/java/org/mirapolis/mvc/view/element/component/datamodel/bean/DataModelBeanTableProvider.java mirafw-core/src/main/java/org/mirapolis/mvc/view/element/component/datamodel/common/DataModelTableProvider.java mirafw-core/src/main/java/org/mirapolis/mvc/view/element/component/datamodel/dataobject/dataobjectmodel/DataObjectDataSourceModelProvider.java mirafw-core/src/main/java/org/mirapolis/mvc/view/element/component/datamodel/dataobject/dataobjectmodel/DataSourceModel.java mirafw-core/src/main/java/org/mirapolis/mvc/view/element/component/datamodel/dataobject/dataobjectmodel/VirtualDataSourceModel.java mirafw-core/src/main/java/org/mirapolis/mvc/view/element/component/datamodel/datasource/DataModelDataSource.java mirafw-core/src/main/java/org/mirapolis/mvc/view/element/component/datamodel/filter/DataModelFilter.java
  493. 14:24:08.195: [MiraFramework] git -c core.quotepath=false -c log.showSignature=false checkout release/4.6.18 --
  494. Switched to branch 'release/4.6.18'
  495. Your branch is up to date with 'origin/release/4.6.18'.
  496. 14:24:09.438: [LMSSystem] git -c core.quotepath=false -c log.showSignature=false checkout release/4.6.18 --
  497. Switched to branch 'release/4.6.18'
  498. Your branch is behind 'origin/release/4.6.18' by 3 commits, and can be fast-forwarded.
  499. (use "git pull" to update your local branch)
  500. 14:25:06.436: [MiraFramework] git -c core.quotepath=false -c log.showSignature=false fetch origin --progress --prune
  501. remote: Counting objects: 132, done.
  502. remote: Compressing objects: 100% (21/21), done.
  503. remote: Total 23 (delta 11), reused 0 (delta 0)
  504. From ssh://dev.mirapolis.ru:22022/MiraFramework
  505. 8f73f2950..d9851a8c0 develop -> origin/develop
  506. 14:25:10.013: [LMSSystem] git -c core.quotepath=false -c log.showSignature=false fetch origin --progress --prune
  507. remote: Counting objects: 778, done.
  508. remote: Compressing objects: 100% (302/302), done.
  509. remote: Total 391 (delta 269), reused 102 (delta 87)
  510. Receiving objects: 100% (391/391), 100.64 KiB | 4.19 MiB/s, done.
  511. Resolving deltas: 100% (269/269), completed with 165 local objects.
  512. From ssh://dev.mirapolis.ru:22022/LMSSystem
  513. 18661e60df..19dfa01296 release/4.6.18 -> origin/release/4.6.18
  514. 1fe0c64e28..900852f480 develop -> origin/develop
  515. ce5724ea56..732f521f84 release/4.6.19 -> origin/release/4.6.19
  516. 299dda6257..4a493809ff release/4.6.20 -> origin/release/4.6.20
  517. 14:25:14.869: [LMSSystem] git -c core.quotepath=false -c log.showSignature=false rebase origin/release/4.6.18
  518. First, rewinding head to replay your work on top of it...
  519. Fast-forwarded release/4.6.18 to origin/release/4.6.18.
  520. 14:55:50.980: [MiraFramework] git -c core.quotepath=false -c log.showSignature=false fetch origin --progress --prune
  521. 14:55:53.774: [LMSSystem] git -c core.quotepath=false -c log.showSignature=false fetch origin --progress --prune
  522. remote: Counting objects: 102, done.
  523. remote: Compressing objects: 100% (19/19), done.
  524. remote: Total 19 (delta 10), reused 0 (delta 0)
  525. From ssh://dev.mirapolis.ru:22022/LMSSystem
  526. 19dfa01296..204ee7de1d release/4.6.18 -> origin/release/4.6.18
  527. 14:55:58.519: [LMSSystem] git -c core.quotepath=false -c log.showSignature=false rebase origin/release/4.6.18
  528. First, rewinding head to replay your work on top of it...
  529. Fast-forwarded release/4.6.18 to origin/release/4.6.18.
  530. 16:06:46.753: [LMSSystem] git -c core.quotepath=false -c log.showSignature=false rm --cached -f -- lms-core/src/main/java/lms/core/measure/MeasureFrame.java
  531. 16:06:46.964: [LMSSystem] git -c core.quotepath=false -c log.showSignature=false checkout HEAD -- lms-core/src/main/java/lms/core/measure/MeasureFrame.java
  532. 16:06:53.769: [MiraFramework] git -c core.quotepath=false -c log.showSignature=false checkout develop --
  533. Your branch is behind 'origin/develop' by 2 commits, and can be fast-forwarded.
  534. Switched to branch 'develop'
  535. (use "git pull" to update your local branch)
  536. 16:06:55.601: [LMSSystem] git -c core.quotepath=false -c log.showSignature=false checkout develop --
  537. Your branch is behind 'origin/develop' by 23 commits, and can be fast-forwarded.
  538. Switched to branch 'develop'
  539. (use "git pull" to update your local branch)
  540. 16:07:19.410: [MiraFramework] git -c core.quotepath=false -c log.showSignature=false fetch origin --progress --prune
  541. 16:07:23.608: [LMSSystem] git -c core.quotepath=false -c log.showSignature=false fetch origin --progress --prune
  542. remote: Counting objects: 274, done.
  543. remote: Compressing objects: 100% (162/162), done.
  544. remote: Total 162 (delta 92), reused 0 (delta 0)
  545. Receiving objects: 100% (162/162), 15.91 KiB | 1018.00 KiB/s, done.
  546. Resolving deltas: 100% (92/92), completed with 55 local objects.
  547. From ssh://dev.mirapolis.ru:22022/LMSSystem
  548. 900852f480..9a56a3e0e6 develop -> origin/develop
  549. 204ee7de1d..81a1b7599b release/4.6.18 -> origin/release/4.6.18
  550. 732f521f84..3492274a1e release/4.6.19 -> origin/release/4.6.19
  551. 4a493809ff..c42ab54e53 release/4.6.20 -> origin/release/4.6.20
  552. 16:07:28.124: [MiraFramework] git -c core.quotepath=false -c log.showSignature=false rebase origin/develop
  553. First, rewinding head to replay your work on top of it...
  554. Fast-forwarded develop to origin/develop.
  555. 16:07:30.260: [LMSSystem] git -c core.quotepath=false -c log.showSignature=false rebase origin/develop
  556. First, rewinding head to replay your work on top of it...
  557. Fast-forwarded develop to origin/develop.
  558. 16:07:52.253: [MiraFramework] git -c core.quotepath=false -c log.showSignature=false checkout -b feature/PORTAL-43221 origin/feature/PORTAL-43221 --
  559. Switched to a new branch 'feature/PORTAL-43221'
  560. Branch 'feature/PORTAL-43221' set up to track remote branch 'feature/PORTAL-43221' from 'origin'.
  561. 16:07:53.645: [LMSSystem] git -c core.quotepath=false -c log.showSignature=false checkout -b feature/PORTAL-43221 origin/feature/PORTAL-43221 --
  562. Switched to a new branch 'feature/PORTAL-43221'
  563. Branch 'feature/PORTAL-43221' set up to track remote branch 'feature/PORTAL-43221' from 'origin'.
  564. 16:08:55.671: [MiraFramework] git -c core.quotepath=false -c log.showSignature=false fetch origin --progress --prune
  565. 16:08:59.368: [LMSSystem] git -c core.quotepath=false -c log.showSignature=false fetch origin --progress --prune
  566. 16:09:17.664: [MiraFramework] git -c core.quotepath=false -c log.showSignature=false checkout develop --
  567. Switched to branch 'develop'
  568. Your branch is up to date with 'origin/develop'.
  569. 16:09:18.981: [LMSSystem] git -c core.quotepath=false -c log.showSignature=false checkout develop --
  570. Switched to branch 'develop'
  571. Your branch is up to date with 'origin/develop'.
  572. 16:09:43.882: [MiraFramework] git -c core.quotepath=false -c log.showSignature=false fetch origin --progress --prune
  573. 16:09:48.073: [LMSSystem] git -c core.quotepath=false -c log.showSignature=false fetch origin --progress --prune
  574. 16:10:26.915: [LMSSystem] git -c core.quotepath=false -c log.showSignature=false merge --no-commit --no-ff remotes/origin/feature/PORTAL-43221
  575. warning: inexact rename detection was skipped due to too many files.
  576. warning: you may want to set your merge.renamelimit variable to at least 1904 and retry the command.
  577. Automatic merge went well; stopped before committing as requested
  578. 16:11:00.262: [LMSSystem] git -c core.quotepath=false -c log.showSignature=false commit --only -F C:\Users\Anatoly\AppData\Local\Temp\git-commit-msg-.txt -- lms-core/src/main/java/mira/constructor/dbcommand/ConstructorFillCaTypesDbUpdateCommand.java lms-core/src/main/java/lms/core/ca/CAFrame.java lms-core/src/main/java/lms/core/person/PersonConstructableStrategy.java lms-core/src/main/java/mira/constructor/view/resolver/AbstractFilterByTypeConstructorViewResolver.java lms-core/src/main/java/lms/core/ca/CAConstructableStrategy.java lms-core/src/main/java/mira/constructor/ConstructorModule.java
  579. fatal: cannot do a partial commit during a merge.
  580.  
  581. 16:11:00.753: [LMSSystem] git -c core.quotepath=false -c log.showSignature=false commit -F C:\Users\Anatoly\AppData\Local\Temp\git-commit-msg-.txt --
  582. [develop 6ea659eb0a] PORTAL-43221 - [Почта России]. Разграничение для просмотра карточек организаций по типу и по роли
  583.  
  584. 16:11:04.982: [LMSSystem] git -c core.quotepath=false -c log.showSignature=false push --progress --porcelain origin refs/heads/develop:develop
  585. Counting objects: 17, done.
  586. Delta compression using up to 16 threads.
  587. Compressing objects: 100% (17/17), done.
  588. Writing objects: 100% (17/17), 1.62 KiB | 831.00 KiB/s, done.
  589. Total 17 (delta 12), reused 0 (delta 0)
  590. remote: 2018-08-01 16:11:10,377 [MainThread ] [INFO ] Process push into branch refs/heads/develop
  591. To ssh://dev.mirapolis.ru:22022/LMSSystem
  592. refs/heads/develop:refs/heads/develop 9a56a3e0e6..6ea659eb0a
  593. Done
  594. 16:13:03.235: [MiraFramework] git -c core.quotepath=false -c log.showSignature=false checkout release/4.6.17 --
  595. Your branch is up to date with 'origin/release/4.6.17'.
  596. Switched to branch 'release/4.6.17'
  597. 16:13:09.083: [LMSSystem] git -c core.quotepath=false -c log.showSignature=false checkout release/4.6.17 --
  598. Switched to branch 'release/4.6.17'
  599. Your branch is up to date with 'origin/release/4.6.17'.
  600. 16:28:08.088: [LMSSystem] git -c core.quotepath=false -c log.showSignature=false commit --only -F C:\Users\Anatoly\AppData\Local\Temp\git-commit-msg-.txt -- lms-core/src/main/java/hr/integration/site/superjob/SuperJobAPI.java
  601. [release/4.6.17 ca28b22ddc] PORTAL-43880 - [IXFIVE] Ошибка при архивации вакансии
  602. 1 file changed, 1 insertion(+), 1 deletion(-)
  603.  
  604. 16:28:12.352: [LMSSystem] git -c core.quotepath=false -c log.showSignature=false push --progress --porcelain origin refs/heads/release/4.6.17:release/4.6.17
  605. Counting objects: 11, done.
  606. Delta compression using up to 16 threads.
  607. Compressing objects: 100% (11/11), done.
  608. Writing objects: 100% (11/11), 938 bytes | 938.00 KiB/s, done.
  609. Total 11 (delta 7), reused 0 (delta 0)
  610. remote: 2018-08-01 16:28:16,129 [MainThread ] [INFO ] Process push into branch refs/heads/release/4.6.17
  611. remote: 2018-08-01 16:28:16,130 [MainThread ] [DEBUG] /home/git/repositories/LMSSystem.git
  612. remote: 2018-08-01 16:28:16,144 [MainThread ] [DEBUG] git reset --hard
  613. remote: 2018-08-01 16:28:17,014 [MainThread ] [INFO ] HEAD is now at 6ea659e PORTAL-43221 - [Почта России]. Разграничение для просмотра карточек организаций по типу и по роли
  614. remote:
  615. remote: 2018-08-01 16:28:17,020 [MainThread ] [DEBUG] Last command result: 0
  616. remote: 2018-08-01 16:28:17,021 [MainThread ] [DEBUG] git checkout -q release/4.6.18
  617. remote: 2018-08-01 16:28:18,122 [MainThread ] [DEBUG] Last command result: 0
  618. remote: 2018-08-01 16:28:18,123 [MainThread ] [DEBUG] git reset --hard
  619. remote: 2018-08-01 16:28:19,123 [MainThread ] [INFO ] HEAD is now at 81a1b75 PORTAL-44875 - [Аналитические технологии] Error on start Application. Please contact administrator при обновление системы
  620. remote:
  621. remote: 2018-08-01 16:28:19,130 [MainThread ] [DEBUG] Last command result: 0
  622. remote: 2018-08-01 16:28:19,131 [MainThread ] [DEBUG] git branch -D release/4.6.18-merge-temp
  623. remote: 2018-08-01 16:28:19,138 [MainThread ] [INFO ] error: branch 'release/4.6.18-merge-temp' not found.
  624. remote:
  625. remote: 2018-08-01 16:28:19,139 [MainThread ] [DEBUG] Last command result: 1
  626. remote: 2018-08-01 16:28:19,139 [MainThread ] [DEBUG] git checkout -q -b release/4.6.18-merge-temp
  627. remote: 2018-08-01 16:28:19,778 [MainThread ] [DEBUG] Last command result: 0
  628. remote: 2018-08-01 16:28:19,788 [MainThread ] [DEBUG] git merge heads/release/4.6.17 -m 'PORTAL-43880 - [IXFIVE] Ошибка при архивации вакансии
  629. remote: '
  630. remote: 2018-08-01 16:28:21,137 [MainThread ] [INFO ] warning: inexact rename detection was skipped due to too many files.
  631. remote:
  632. remote: 2018-08-01 16:28:21,138 [MainThread ] [INFO ] warning: you may want to set your merge.renamelimit variable to at least 7116 and retry the command.
  633. remote:
  634. remote: 2018-08-01 16:28:21,381 [MainThread ] [INFO ] Auto-merging lms-core/src/main/resources/Resources/MessageBundles/Person_ru.properties
  635. remote:
  636. remote: 2018-08-01 16:28:21,381 [MainThread ] [INFO ] CONFLICT (content): Merge conflict in lms-core/src/main/resources/Resources/MessageBundles/Person_ru.properties
  637. remote:
  638. remote: 2018-08-01 16:28:21,382 [MainThread ] [INFO ] Auto-merging lms-core/src/main/java/lms/core/person/work/deputy/PersonWorkDeputyService.java
  639. remote:
  640. remote: 2018-08-01 16:28:21,382 [MainThread ] [INFO ] Auto-merging lms-core/src/main/java/lms/core/person/work/deputy/ClearDeputyPersonAction.java
  641. remote:
  642. remote: 2018-08-01 16:28:21,382 [MainThread ] [INFO ] CONFLICT (content): Merge conflict in lms-core/src/main/java/lms/core/person/work/deputy/ClearDeputyPersonAction.java
  643. remote:
  644. remote: 2018-08-01 16:28:21,382 [MainThread ] [INFO ] Auto-merging lms-core/src/main/java/lms/core/person/PersonMessage.java
  645. remote:
  646. remote: 2018-08-01 16:28:21,382 [MainThread ] [INFO ] CONFLICT (content): Merge conflict in lms-core/src/main/java/lms/core/person/PersonMessage.java
  647. remote:
  648. remote: 2018-08-01 16:28:21,383 [MainThread ] [INFO ] CONFLICT (modify/delete): lms-core/src/main/java/hr/integration/site/superjob/SuperJobAPI.java deleted in HEAD and modified in heads/release/4.6.17. Version heads/release/4.6.17 of lms-core/src/main/java/hr/integration/site/superjob/SuperJobAPI.java left in tree.
  649. remote:
  650. remote: 2018-08-01 16:28:21,383 [MainThread ] [INFO ] Automatic merge failed; fix conflicts and then commit the result.
  651. remote:
  652. remote: 2018-08-01 16:28:21,392 [MainThread ] [DEBUG] Last command result: 1
  653. remote: 2018-08-01 16:28:21,393 [MainThread ] [DEBUG] git reset --hard
  654. remote: 2018-08-01 16:28:22,053 [MainThread ] [INFO ] HEAD is now at 81a1b75 PORTAL-44875 - [Аналитические технологии] Error on start Application. Please contact administrator при обновление системы
  655. remote:
  656. remote: 2018-08-01 16:28:22,059 [MainThread ] [DEBUG] Last command result: 0
  657. remote: 2018-08-01 16:28:22,059 [MainThread ] [INFO ] MERGE release/4.6.17 -> release/4.6.18 [FAIL]
  658. remote: 2018-08-01 16:28:22,060 [MainThread ] [WARNI] Please resolve merge conflicts manually
  659. remote: 2018-08-01 16:28:22,060 [MainThread ] [WARNI] Don't forget to update local release/4.6.17 branch
  660. remote: 2018-08-01 16:28:22,060 [MainThread ] [DEBUG] git checkout -q develop
  661. remote: 2018-08-01 16:28:23,018 [MainThread ] [DEBUG] Last command result: 0
  662. remote: 2018-08-01 16:28:23,019 [MainThread ] [DEBUG] git branch -D release/4.6.18-merge-temp
  663. remote: 2018-08-01 16:28:23,032 [MainThread ] [INFO ] Deleted branch release/4.6.18-merge-temp (was 81a1b75).
  664. remote:
  665. remote: 2018-08-01 16:28:23,037 [MainThread ] [DEBUG] Last command result: 0
  666. remote: 2018-08-01 16:28:23,037 [MainThread ] [WARNI] Failed to merge branch release/4.6.17 into release/4.6.18. Please resolve merge conflicts manually. Don't forget to update local release/4.6.17 branch
  667. remote: 2018-08-01 16:28:23,037 [MainThread ] [DEBUG] send_mail
  668. remote: 2018-08-01 16:28:23,060 [MainThread ] [DEBUG] sending email to author of last commit ca28b22ddcdb0b4282b4d5efebd18fb3114c6575 : Anatoliy.Petrov@mirapolis.ru
  669. remote: 2018-08-01 16:28:23,081 [MainThread ] [DEBUG] Subject: Merge fail
  670. remote: From: noreply@mirapolismail.ru
  671. remote: To: Anatoliy.Petrov@mirapolis.ru, usov@mirapolis.ru
  672. remote: Content-Type: text/plain; charset="utf-8"
  673. remote: Content-Transfer-Encoding: 7bit
  674. remote: MIME-Version: 1.0
  675. remote:
  676. remote: Commit author=Anatoliy.Petrov@mirapolis.ru. Failed to merge branch release/4.6.17 into release/4.6.18. Please resolve merge conflicts manually. Don't forget to update local release/4.6.17 branch
  677. remote:
  678. remote: 2018-08-01 16:28:23,142 [MainThread ] [DEBUG] successfully sent the mail.
  679. To ssh://dev.mirapolis.ru:22022/LMSSystem
  680. refs/heads/release/4.6.17:refs/heads/release/4.6.17 9fc56f906c..ca28b22ddc
  681. Done
  682. 16:28:44.720: [MiraFramework] git -c core.quotepath=false -c log.showSignature=false fetch origin --progress --prune
  683. 16:28:47.546: [LMSSystem] git -c core.quotepath=false -c log.showSignature=false fetch origin --progress --prune
  684. 16:28:56.186: [MiraFramework] git -c core.quotepath=false -c log.showSignature=false checkout release/4.6.18 --
  685. Your branch is up to date with 'origin/release/4.6.18'.
  686. Switched to branch 'release/4.6.18'
  687. 16:29:04.200: [LMSSystem] git -c core.quotepath=false -c log.showSignature=false checkout release/4.6.18 --
  688. Switched to branch 'release/4.6.18'
  689. Your branch is behind 'origin/release/4.6.18' by 3 commits, and can be fast-forwarded.
  690. (use "git pull" to update your local branch)
  691. 16:30:17.640: [MiraFramework] git -c core.quotepath=false -c log.showSignature=false fetch origin --progress --prune
  692. 16:30:21.158: [LMSSystem] git -c core.quotepath=false -c log.showSignature=false fetch origin --progress --prune
  693. 16:30:25.574: [LMSSystem] git -c core.quotepath=false -c log.showSignature=false rebase origin/release/4.6.18
  694. First, rewinding head to replay your work on top of it...
  695. Fast-forwarded release/4.6.18 to origin/release/4.6.18.
  696. 16:30:50.741: [LMSSystem] git -c core.quotepath=false -c log.showSignature=false merge --no-commit remotes/origin/release/4.6.17
  697. warning: inexact rename detection was skipped due to too many files.
  698. warning: you may want to set your merge.renamelimit variable to at least 7116 and retry the command.
  699. 16:31:39.958: [MiraFramework] git -c core.quotepath=false -c log.showSignature=false checkout release/4.6.17 --
  700. Switched to branch 'release/4.6.17'
  701. Your branch is up to date with 'origin/release/4.6.17'.
  702. 16:31:45.249: [LMSSystem] git -c core.quotepath=false -c log.showSignature=false checkout release/4.6.17 --
  703. error: you need to resolve your current index first
  704. lms-core/src/main/java/hr/integration/site/superjob/SuperJobAPI.java: needs merge
  705. lms-core/src/main/java/lms/core/person/PersonMessage.java: needs merge
  706. lms-core/src/main/java/lms/core/person/work/deputy/ClearDeputyPersonAction.java: needs merge
  707. lms-core/src/main/resources/Resources/MessageBundles/Person_ru.properties: needs merge
  708. 16:31:49.226: [MiraFramework] git -c core.quotepath=false -c log.showSignature=false checkout --force release/4.6.18 --
  709. Switched to branch 'release/4.6.18'
  710. Your branch is up to date with 'origin/release/4.6.18'.
  711. 16:32:04.182: [LMSSystem] git -c core.quotepath=false -c log.showSignature=false rm --cached -f -- lms-core/src/main/java/hr/integration/site/superjob/SuperJobAPI.java lms-core/src/main/java/lms/core/person/work/deputy/ClearDeputyPersonAction.java lms-core/src/main/java/lms/core/person/work/deputy/PersonWorkDeputyService.java lms-core/src/main/java/lms/core/person/PersonMessage.java lms-core/src/main/resources/Resources/MessageBundles/Person_ru.properties
  712. 16:32:04.463: [LMSSystem] git -c core.quotepath=false -c log.showSignature=false checkout HEAD -- lms-core/src/main/java/hr/integration/site/superjob/SuperJobAPI.java lms-core/src/main/java/lms/core/person/work/deputy/ClearDeputyPersonAction.java lms-core/src/main/java/lms/core/person/work/deputy/PersonWorkDeputyService.java lms-core/src/main/java/lms/core/person/PersonMessage.java lms-core/src/main/resources/Resources/MessageBundles/Person_ru.properties
  713. error: pathspec 'lms-core/src/main/java/hr/integration/site/superjob/SuperJobAPI.java' did not match any file(s) known to git.
  714.  
  715. 16:32:18.159: [LMSSystem] git -c core.quotepath=false -c log.showSignature=false checkout HEAD -- lms-core/src/main/java/lms/core/person/work/deputy/ClearDeputyPersonAction.java lms-core/src/main/java/lms/core/person/work/deputy/PersonWorkDeputyService.java lms-core/src/main/java/lms/core/person/PersonMessage.java lms-core/src/main/resources/Resources/MessageBundles/Person_ru.properties
  716. 16:32:23.988: [MiraFramework] git -c core.quotepath=false -c log.showSignature=false checkout release/4.6.17 --
  717. Switched to branch 'release/4.6.17'
  718. Your branch is up to date with 'origin/release/4.6.17'.
  719. 16:32:29.459: [LMSSystem] git -c core.quotepath=false -c log.showSignature=false checkout release/4.6.17 --
  720. error: The following untracked working tree files would be overwritten by checkout:
  721. lms-core/src/main/java/hr/integration/site/superjob/SuperJobAPI.java
  722. Please move or remove them before you switch branches.
  723. Aborting
  724. 16:32:39.189: [MiraFramework] git -c core.quotepath=false -c log.showSignature=false checkout --force release/4.6.18 --
  725. Switched to branch 'release/4.6.18'
  726. Your branch is up to date with 'origin/release/4.6.18'.
  727. 16:32:54.946: [LMSSystem] git -c core.quotepath=false -c log.showSignature=false rm --ignore-unmatch --cached -- lms-core/src/main/java/hr/integration/site/superjob/SuperJobAPI.java
  728. 16:33:01.223: [MiraFramework] git -c core.quotepath=false -c log.showSignature=false checkout release/4.6.17 --
  729. Switched to branch 'release/4.6.17'
  730. Your branch is up to date with 'origin/release/4.6.17'.
  731. 16:33:06.432: [LMSSystem] git -c core.quotepath=false -c log.showSignature=false checkout release/4.6.17 --
  732. Switched to branch 'release/4.6.17'
  733. Your branch is up to date with 'origin/release/4.6.17'.
  734. 16:33:40.975: [MiraFramework] git -c core.quotepath=false -c log.showSignature=false fetch origin --progress --prune
  735. 16:33:43.431: [LMSSystem] git -c core.quotepath=false -c log.showSignature=false fetch origin --progress --prune
  736. remote: Counting objects: 57, done.
  737. remote: Compressing objects: 100% (13/13), done.
  738. remote: Total 13 (delta 10), reused 0 (delta 0)
  739. From ssh://dev.mirapolis.ru:22022/LMSSystem
  740. 6ea659eb0a..dacc34efc1 develop -> origin/develop
  741. 16:33:51.874: [MiraFramework] git -c core.quotepath=false -c log.showSignature=false fetch origin --progress --prune
  742. 16:33:54.495: [LMSSystem] git -c core.quotepath=false -c log.showSignature=false fetch origin --progress --prune
  743. 16:34:00.389: [MiraFramework] git -c core.quotepath=false -c log.showSignature=false checkout release/4.6.18 --
  744. Switched to branch 'release/4.6.18'
  745. Your branch is up to date with 'origin/release/4.6.18'.
  746. 16:34:06.310: [LMSSystem] git -c core.quotepath=false -c log.showSignature=false checkout release/4.6.18 --
  747. Your branch is up to date with 'origin/release/4.6.18'.
  748. Switched to branch 'release/4.6.18'
  749. 16:34:54.737: [MiraFramework] git -c core.quotepath=false -c log.showSignature=false fetch origin --progress --prune
  750. 16:34:58.158: [LMSSystem] git -c core.quotepath=false -c log.showSignature=false fetch origin --progress --prune
  751. 16:35:15.465: [LMSSystem] git -c core.quotepath=false -c log.showSignature=false merge --no-commit --no-ff remotes/origin/release/4.6.17
  752. warning: inexact rename detection was skipped due to too many files.
  753. warning: you may want to set your merge.renamelimit variable to at least 7116 and retry the command.
  754. 16:38:54.382: [LMSSystem] git -c core.quotepath=false -c log.showSignature=false add --ignore-errors -- lms-core/src/main/java/lms/core/person/work/deputy/ClearDeputyPersonAction.java
  755. 16:39:30.533: [LMSSystem] git -c core.quotepath=false -c log.showSignature=false add --ignore-errors -- lms-core/src/main/resources/Resources/MessageBundles/Person_ru.properties
  756. 16:40:00.625: [LMSSystem] git -c core.quotepath=false -c log.showSignature=false add --ignore-errors -- lms-core/src/main/java/lms/core/person/PersonMessage.java
  757. 16:40:15.441: [LMSSystem] git -c core.quotepath=false -c log.showSignature=false rm -- lms-core/src/main/java/hr/integration/site/superjob/SuperJobAPI.java
  758. 16:40:55.533: [MiraFramework] git -c core.quotepath=false -c log.showSignature=false fetch origin --progress --prune
  759. 16:40:58.864: [LMSSystem] git -c core.quotepath=false -c log.showSignature=false fetch origin --progress --prune
  760. remote: Counting objects: 91, done.
  761. remote: Compressing objects: 100% (30/30), done.
  762. remote: Total 30 (delta 16), reused 0 (delta 0)
  763. From ssh://dev.mirapolis.ru:22022/LMSSystem
  764. dacc34efc1..1ba86878b1 develop -> origin/develop
  765. 16:42:25.434: [LMSSystem] git -c core.quotepath=false -c log.showSignature=false commit --only -F C:\Users\Anatoly\AppData\Local\Temp\git-commit-msg-.txt -- lms-core/src/main/java/lms/core/person/PersonMessage.java lms-core/src/main/java/lms/core/person/work/deputy/ClearDeputyPersonAction.java lms-core/src/main/java/lms/core/person/work/deputy/PersonWorkDeputyService.java lms-core/src/main/resources/Resources/MessageBundles/Person_ru.properties
  766. fatal: cannot do a partial commit during a merge.
  767.  
  768. 16:42:25.892: [LMSSystem] git -c core.quotepath=false -c log.showSignature=false commit -F C:\Users\Anatoly\AppData\Local\Temp\git-commit-msg-.txt --
  769. [release/4.6.18 1966174b69] PORTAL-43880 - [IXFIVE] Ошибка при архивации вакансии
  770.  
  771. 16:42:38.879: [LMSSystem] git -c core.quotepath=false -c log.showSignature=false push --progress --porcelain origin refs/heads/release/4.6.18:release/4.6.18
  772. Counting objects: 18, done.
  773. Delta compression using up to 16 threads.
  774. Compressing objects: 100% (18/18), done.
  775. Writing objects: 100% (18/18), 1.67 KiB | 857.00 KiB/s, done.
  776. Total 18 (delta 14), reused 0 (delta 0)
  777. remote: 2018-08-01 16:42:43,315 [MainThread ] [INFO ] Process push into branch refs/heads/release/4.6.18
  778. remote: 2018-08-01 16:42:43,315 [MainThread ] [DEBUG] /home/git/repositories/LMSSystem.git
  779. remote: 2018-08-01 16:42:43,327 [MainThread ] [DEBUG] git reset --hard
  780. remote: 2018-08-01 16:42:44,228 [MainThread ] [INFO ] HEAD is now at 1ba8687 PORTAL-44438 - [Почта России] В оценочной анкете вида "Компактная таблица" реализовать возможность не отображать иконку компетенции/индикатора".
  781. remote:
  782. remote: 2018-08-01 16:42:44,233 [MainThread ] [DEBUG] Last command result: 0
  783. remote: 2018-08-01 16:42:44,233 [MainThread ] [DEBUG] git checkout -q release/4.6.19
  784. remote: 2018-08-01 16:42:44,996 [MainThread ] [DEBUG] Last command result: 0
  785. remote: 2018-08-01 16:42:44,996 [MainThread ] [DEBUG] git reset --hard
  786. remote: 2018-08-01 16:42:45,922 [MainThread ] [INFO ] HEAD is now at 3492274 Merge remote-tracking branch 'origin/release/4.6.19' into release/4.6.19
  787. remote:
  788. remote: 2018-08-01 16:42:45,928 [MainThread ] [DEBUG] Last command result: 0
  789. remote: 2018-08-01 16:42:45,928 [MainThread ] [DEBUG] git branch -D release/4.6.19-merge-temp
  790. remote: 2018-08-01 16:42:45,933 [MainThread ] [INFO ] error: branch 'release/4.6.19-merge-temp' not found.
  791. remote:
  792. remote: 2018-08-01 16:42:45,934 [MainThread ] [DEBUG] Last command result: 1
  793. remote: 2018-08-01 16:42:45,935 [MainThread ] [DEBUG] git checkout -q -b release/4.6.19-merge-temp
  794. remote: 2018-08-01 16:42:46,756 [MainThread ] [DEBUG] Last command result: 0
  795. remote: 2018-08-01 16:42:46,776 [MainThread ] [DEBUG] git merge heads/release/4.6.18 -m 'PORTAL-43880 - [IXFIVE] Ошибка при архивации вакансии
  796. remote: '
  797. remote: 2018-08-01 16:42:48,172 [MainThread ] [INFO ] Auto-merging lms-core/src/main/resources/Resources/MessageBundles/Person_ru.properties
  798. remote:
  799. remote: 2018-08-01 16:42:48,172 [MainThread ] [INFO ] Auto-merging lms-core/src/main/java/lms/core/person/PersonMessage.java
  800. remote:
  801. remote: 2018-08-01 16:42:48,182 [MainThread ] [INFO ] Merge made by the 'recursive' strategy.
  802. remote:
  803. remote: 2018-08-01 16:42:48,188 [MainThread ] [INFO ] .../main/java/lms/core/person/PersonMessage.java | 2 +-
  804. remote:
  805. remote: 2018-08-01 16:42:48,188 [MainThread ] [INFO ] .../work/deputy/ClearDeputyPersonAction.java | 11 +++++-
  806. remote:
  807. remote: 2018-08-01 16:42:48,188 [MainThread ] [INFO ] .../work/deputy/PersonWorkDeputyService.java | 40 +++++++++++++---------
  808. remote:
  809. remote: 2018-08-01 16:42:48,188 [MainThread ] [INFO ] .../Resources/MessageBundles/Person_ru.properties | 3 +-
  810. remote:
  811. remote: 2018-08-01 16:42:48,189 [MainThread ] [INFO ] 4 files changed, 36 insertions(+), 20 deletions(-)
  812. remote:
  813. remote: 2018-08-01 16:42:48,194 [MainThread ] [DEBUG] Last command result: 0
  814. remote: 2018-08-01 16:42:48,195 [MainThread ] [DEBUG] git checkout -q release/4.6.19
  815. remote: 2018-08-01 16:42:48,801 [MainThread ] [DEBUG] Last command result: 0
  816. remote: 2018-08-01 16:42:48,802 [MainThread ] [DEBUG] git merge heads/release/4.6.19-merge-temp -m 'PORTAL-43880 - [IXFIVE] Ошибка при архивации вакансии
  817. remote: '
  818. remote: 2018-08-01 16:42:49,522 [MainThread ] [INFO ] Updating 3492274..a5d016a
  819. remote:
  820. remote: 2018-08-01 16:42:49,522 [MainThread ] [INFO ] Fast-forward (no commit created; -m option ignored)
  821. remote:
  822. remote: 2018-08-01 16:42:49,531 [MainThread ] [INFO ] .../main/java/lms/core/person/PersonMessage.java | 2 +-
  823. remote:
  824. remote: 2018-08-01 16:42:49,532 [MainThread ] [INFO ] .../work/deputy/ClearDeputyPersonAction.java | 11 +++++-
  825. remote:
  826. remote: 2018-08-01 16:42:49,532 [MainThread ] [INFO ] .../work/deputy/PersonWorkDeputyService.java | 40 +++++++++++++---------
  827. remote:
  828. remote: 2018-08-01 16:42:49,532 [MainThread ] [INFO ] .../Resources/MessageBundles/Person_ru.properties | 3 +-
  829. remote:
  830. remote: 2018-08-01 16:42:49,533 [MainThread ] [INFO ] 4 files changed, 36 insertions(+), 20 deletions(-)
  831. remote:
  832. remote: 2018-08-01 16:42:49,540 [MainThread ] [DEBUG] Last command result: 0
  833. remote: 2018-08-01 16:42:49,541 [MainThread ] [INFO ] MERGE release/4.6.18 -> release/4.6.19 [SUCCESS]
  834. remote: 2018-08-01 16:42:49,541 [MainThread ] [DEBUG] git checkout -q develop
  835. remote: 2018-08-01 16:42:50,781 [MainThread ] [DEBUG] Last command result: 0
  836. remote: 2018-08-01 16:42:50,782 [MainThread ] [DEBUG] git branch -D release/4.6.19-merge-temp
  837. remote: 2018-08-01 16:42:50,793 [MainThread ] [INFO ] Deleted branch release/4.6.19-merge-temp (was a5d016a).
  838. remote:
  839. remote: 2018-08-01 16:42:50,795 [MainThread ] [DEBUG] Last command result: 0
  840. remote: 2018-08-01 16:42:50,810 [MainThread ] [DEBUG] git reset --hard
  841. remote: 2018-08-01 16:42:51,963 [MainThread ] [INFO ] HEAD is now at 1ba8687 PORTAL-44438 - [Почта России] В оценочной анкете вида "Компактная таблица" реализовать возможность не отображать иконку компетенции/индикатора".
  842. remote:
  843. remote: 2018-08-01 16:42:51,970 [MainThread ] [DEBUG] Last command result: 0
  844. remote: 2018-08-01 16:42:51,971 [MainThread ] [DEBUG] git checkout -q release/4.6.20
  845. remote: 2018-08-01 16:42:52,665 [MainThread ] [DEBUG] Last command result: 0
  846. remote: 2018-08-01 16:42:52,665 [MainThread ] [DEBUG] git reset --hard
  847. remote: 2018-08-01 16:42:53,552 [MainThread ] [INFO ] HEAD is now at c42ab54 PORTAL-44875 - [Аналитические технологии] Error on start Application. Please contact administrator при обновление системы
  848. remote:
  849. remote: 2018-08-01 16:42:53,559 [MainThread ] [DEBUG] Last command result: 0
  850. remote: 2018-08-01 16:42:53,560 [MainThread ] [DEBUG] git branch -D release/4.6.20-merge-temp
  851. remote: 2018-08-01 16:42:53,570 [MainThread ] [INFO ] error: branch 'release/4.6.20-merge-temp' not found.
  852. remote:
  853. remote: 2018-08-01 16:42:53,571 [MainThread ] [DEBUG] Last command result: 1
  854. remote: 2018-08-01 16:42:53,571 [MainThread ] [DEBUG] git checkout -q -b release/4.6.20-merge-temp
  855. remote: 2018-08-01 16:42:54,463 [MainThread ] [DEBUG] Last command result: 0
  856. remote: 2018-08-01 16:42:54,477 [MainThread ] [DEBUG] git merge heads/release/4.6.19 -m 'PORTAL-43880 - [IXFIVE] Ошибка при архивации вакансии
  857. remote: '
  858. remote: 2018-08-01 16:42:55,987 [MainThread ] [INFO ] Merge made by the 'recursive' strategy.
  859. remote:
  860. remote: 2018-08-01 16:42:55,998 [MainThread ] [INFO ] .../core/ca/choose/ChooseCaByTypeListFrame.java | 4 ++-
  861. remote:
  862. remote: 2018-08-01 16:42:55,999 [MainThread ] [INFO ] .../main/java/lms/core/person/PersonMessage.java | 2 +-
  863. remote:
  864. remote: 2018-08-01 16:42:55,999 [MainThread ] [INFO ] .../work/deputy/ClearDeputyPersonAction.java | 11 +++++-
  865. remote:
  866. remote: 2018-08-01 16:42:55,999 [MainThread ] [INFO ] .../work/deputy/PersonWorkDeputyService.java | 40 +++++++++++++---------
  867. remote:
  868. remote: 2018-08-01 16:42:55,999 [MainThread ] [INFO ] .../Resources/MessageBundles/Person_ru.properties | 3 +-
  869. remote:
  870. remote: 2018-08-01 16:42:55,999 [MainThread ] [INFO ] 5 files changed, 39 insertions(+), 21 deletions(-)
  871. remote:
  872. remote: 2018-08-01 16:42:56,004 [MainThread ] [DEBUG] Last command result: 0
  873. remote: 2018-08-01 16:42:56,005 [MainThread ] [DEBUG] git checkout -q release/4.6.20
  874. remote: 2018-08-01 16:42:56,630 [MainThread ] [DEBUG] Last command result: 0
  875. remote: 2018-08-01 16:42:56,630 [MainThread ] [DEBUG] git merge heads/release/4.6.20-merge-temp -m 'PORTAL-43880 - [IXFIVE] Ошибка при архивации вакансии
  876. remote: '
  877. remote: 2018-08-01 16:42:57,255 [MainThread ] [INFO ] Updating c42ab54..067ba8f
  878. remote:
  879. remote: 2018-08-01 16:42:57,256 [MainThread ] [INFO ] Fast-forward (no commit created; -m option ignored)
  880. remote:
  881. remote: 2018-08-01 16:42:57,263 [MainThread ] [INFO ] .../core/ca/choose/ChooseCaByTypeListFrame.java | 4 ++-
  882. remote:
  883. remote: 2018-08-01 16:42:57,263 [MainThread ] [INFO ] .../main/java/lms/core/person/PersonMessage.java | 2 +-
  884. remote:
  885. remote: 2018-08-01 16:42:57,263 [MainThread ] [INFO ] .../work/deputy/ClearDeputyPersonAction.java | 11 +++++-
  886. remote:
  887. remote: 2018-08-01 16:42:57,264 [MainThread ] [INFO ] .../work/deputy/PersonWorkDeputyService.java | 40 +++++++++++++---------
  888. remote:
  889. remote: 2018-08-01 16:42:57,264 [MainThread ] [INFO ] .../Resources/MessageBundles/Person_ru.properties | 3 +-
  890. remote:
  891. remote: 2018-08-01 16:42:57,264 [MainThread ] [INFO ] 5 files changed, 39 insertions(+), 21 deletions(-)
  892. remote:
  893. remote: 2018-08-01 16:42:57,268 [MainThread ] [DEBUG] Last command result: 0
  894. remote: 2018-08-01 16:42:57,268 [MainThread ] [INFO ] MERGE release/4.6.19 -> release/4.6.20 [SUCCESS]
  895. remote: 2018-08-01 16:42:57,268 [MainThread ] [DEBUG] git checkout -q develop
  896. remote: 2018-08-01 16:42:58,131 [MainThread ] [DEBUG] Last command result: 0
  897. remote: 2018-08-01 16:42:58,131 [MainThread ] [DEBUG] git branch -D release/4.6.20-merge-temp
  898. remote: 2018-08-01 16:42:58,138 [MainThread ] [INFO ] Deleted branch release/4.6.20-merge-temp (was 067ba8f).
  899. remote:
  900. remote: 2018-08-01 16:42:58,138 [MainThread ] [DEBUG] Last command result: 0
  901. remote: 2018-08-01 16:42:58,149 [MainThread ] [DEBUG] git reset --hard
  902. remote: 2018-08-01 16:42:59,095 [MainThread ] [INFO ] HEAD is now at 1ba8687 PORTAL-44438 - [Почта России] В оценочной анкете вида "Компактная таблица" реализовать возможность не отображать иконку компетенции/индикатора".
  903. remote:
  904. remote: 2018-08-01 16:42:59,101 [MainThread ] [DEBUG] Last command result: 0
  905. remote: 2018-08-01 16:42:59,101 [MainThread ] [DEBUG] git checkout -q develop
  906. remote: 2018-08-01 16:43:00,028 [MainThread ] [DEBUG] Last command result: 0
  907. remote: 2018-08-01 16:43:00,029 [MainThread ] [DEBUG] git reset --hard
  908. remote: 2018-08-01 16:43:01,120 [MainThread ] [INFO ] HEAD is now at 1ba8687 PORTAL-44438 - [Почта России] В оценочной анкете вида "Компактная таблица" реализовать возможность не отображать иконку компетенции/индикатора".
  909. remote:
  910. remote: 2018-08-01 16:43:01,129 [MainThread ] [DEBUG] Last command result: 0
  911. remote: 2018-08-01 16:43:01,130 [MainThread ] [DEBUG] git branch -D develop-merge-temp
  912. remote: 2018-08-01 16:43:01,138 [MainThread ] [INFO ] error: branch 'develop-merge-temp' not found.
  913. remote:
  914. remote: 2018-08-01 16:43:01,139 [MainThread ] [DEBUG] Last command result: 1
  915. remote: 2018-08-01 16:43:01,140 [MainThread ] [DEBUG] git checkout -q -b develop-merge-temp
  916. remote: 2018-08-01 16:43:02,091 [MainThread ] [DEBUG] Last command result: 0
  917. remote: 2018-08-01 16:43:02,115 [MainThread ] [DEBUG] git merge heads/release/4.6.20 -m 'PORTAL-43880 - [IXFIVE] Ошибка при архивации вакансии
  918. remote: '
  919. remote: 2018-08-01 16:43:03,732 [MainThread ] [INFO ] Auto-merging lms-core/src/main/resources/Resources/MessageBundles/Person_ru.properties
  920. remote:
  921. remote: 2018-08-01 16:43:03,732 [MainThread ] [INFO ] CONFLICT (content): Merge conflict in lms-core/src/main/resources/Resources/MessageBundles/Person_ru.properties
  922. remote:
  923. remote: 2018-08-01 16:43:03,732 [MainThread ] [INFO ] Auto-merging lms-core/src/main/java/lms/core/person/PersonMessage.java
  924. remote:
  925. remote: 2018-08-01 16:43:03,733 [MainThread ] [INFO ] CONFLICT (content): Merge conflict in lms-core/src/main/java/lms/core/person/PersonMessage.java
  926. remote:
  927. remote: 2018-08-01 16:43:03,733 [MainThread ] [INFO ] Automatic merge failed; fix conflicts and then commit the result.
  928. remote:
  929. remote: 2018-08-01 16:43:03,739 [MainThread ] [DEBUG] Last command result: 1
  930. remote: 2018-08-01 16:43:03,739 [MainThread ] [DEBUG] git reset --hard
  931. remote: 2018-08-01 16:43:04,619 [MainThread ] [INFO ] HEAD is now at 1ba8687 PORTAL-44438 - [Почта России] В оценочной анкете вида "Компактная таблица" реализовать возможность не отображать иконку компетенции/индикатора".
  932. remote:
  933. remote: 2018-08-01 16:43:04,627 [MainThread ] [DEBUG] Last command result: 0
  934. remote: 2018-08-01 16:43:04,628 [MainThread ] [INFO ] MERGE release/4.6.20 -> develop [FAIL]
  935. remote: 2018-08-01 16:43:04,628 [MainThread ] [WARNI] Please resolve merge conflicts manually
  936. remote: 2018-08-01 16:43:04,628 [MainThread ] [WARNI] Don't forget to update local release/4.6.20 branch
  937. remote: 2018-08-01 16:43:04,629 [MainThread ] [DEBUG] git checkout -q develop
  938. remote: 2018-08-01 16:43:05,548 [MainThread ] [DEBUG] Last command result: 0
  939. remote: 2018-08-01 16:43:05,549 [MainThread ] [DEBUG] git branch -D develop-merge-temp
  940. remote: 2018-08-01 16:43:05,560 [MainThread ] [INFO ] Deleted branch develop-merge-temp (was 1ba8687).
  941. remote:
  942. remote: 2018-08-01 16:43:05,561 [MainThread ] [DEBUG] Last command result: 0
  943. remote: 2018-08-01 16:43:05,561 [MainThread ] [WARNI] Failed to merge branch release/4.6.20 into develop. Please resolve merge conflicts manually. Don't forget to update local release/4.6.20 branch
  944. remote: 2018-08-01 16:43:05,562 [MainThread ] [DEBUG] send_mail
  945. remote: 2018-08-01 16:43:05,768 [MainThread ] [DEBUG] sending email to author of last commit 1966174b69385517c5b59a9a4f40137f4e63fe5a : Anatoliy.Petrov@mirapolis.ru
  946. remote:
  947. remote: Traceback (most recent call last):
  948. remote: File "hooks/post-update", line 169, in <module>
  949. remote: try_merge(push_branch)
  950. remote: File "hooks/post-update", line 19, in try_merge
  951. remote: merge(merge_to, merge_from)
  952. remote: File "hooks/post-update", line 51, in merge
  953. remote: try_merge(merge_to)
  954. remote: File "hooks/post-update", line 19, in try_merge
  955. remote: merge(merge_to, merge_from)
  956. remote: File "hooks/post-update", line 51, in merge
  957. remote: try_merge(merge_to)
  958. remote: File "hooks/post-update", line 19, in try_merge
  959. remote: merge(merge_to, merge_from)
  960. remote: File "hooks/post-update", line 43, in merge
  961. remote: f"Failed to merge branch {merge_from} into {merge_to}. "
  962. remote: OSError: Failed to merge branch release/4.6.20 into develop. Please resolve merge conflicts manually. Don't forget to update local release/4.6.20 branch
  963. remote:
  964. remote: During handling of the above exception, another exception occurred:
  965. remote:
  966. remote: Traceback (most recent call last):
  967. remote: File "hooks/post-update", line 172, in <module>
  968. remote: notify(push_branch, e)
  969. remote: File "hooks/post-update", line 107, in notify
  970. remote: send_mail(to_email=author_email, subject="Merge fail", message=f"Commit author={author_email}. {str(error)}")
  971. remote: File "hooks/post-update", line 116, in send_mail
  972. remote: msg['To'] = f"{to_email}, usov@mirapolis.ru"
  973. remote: File "/usr/local/lib/python3.6/email/message.py", line 409, in __setitem__
  974. remote: self._headers.append(self.policy.header_store_parse(name, val))
  975. remote: File "/usr/local/lib/python3.6/email/policy.py", line 145, in header_store_parse
  976. remote: raise ValueError("Header values may not contain linefeed "
  977. remote: ValueError: Header values may not contain linefeed or carriage return characters
  978. To ssh://dev.mirapolis.ru:22022/LMSSystem
  979. refs/heads/release/4.6.18:refs/heads/release/4.6.18 81a1b7599b..1966174b69
  980. Done
  981. 16:43:59.177: [MiraFramework] git -c core.quotepath=false -c log.showSignature=false checkout develop --
  982. Switched to branch 'develop'
  983. Your branch is up to date with 'origin/develop'.
  984. 16:44:00.185: [LMSSystem] git -c core.quotepath=false -c log.showSignature=false checkout develop --
  985. Your branch is behind 'origin/develop' by 2 commits, and can be fast-forwarded.
  986. Switched to branch 'develop'
  987. (use "git pull" to update your local branch)
  988. 16:44:23.151: [MiraFramework] git -c core.quotepath=false -c log.showSignature=false fetch origin --progress --prune
  989. 16:44:25.749: [LMSSystem] git -c core.quotepath=false -c log.showSignature=false fetch origin --progress --prune
  990. remote: Counting objects: 153, done.
  991. remote: Compressing objects: 100% (28/28), done.
  992. remote: Total 28 (delta 20), reused 0 (delta 0)
  993. From ssh://dev.mirapolis.ru:22022/LMSSystem
  994. 3492274a1e..a5d016aaaf release/4.6.19 -> origin/release/4.6.19
  995. c42ab54e53..067ba8fa4e release/4.6.20 -> origin/release/4.6.20
  996. 16:44:30.736: [LMSSystem] git -c core.quotepath=false -c log.showSignature=false rebase origin/develop
  997. First, rewinding head to replay your work on top of it...
  998. Fast-forwarded develop to origin/develop.
  999. 16:46:15.763: [MiraFramework] git -c core.quotepath=false -c log.showSignature=false fetch origin --progress --prune
  1000. 16:46:19.365: [LMSSystem] git -c core.quotepath=false -c log.showSignature=false fetch origin --progress --prune
  1001. remote: Counting objects: 130, done.
  1002. remote: Compressing objects: 100% (10/10), done.
  1003. remote: Total 20 (delta 14), reused 16 (delta 10)
  1004. From ssh://dev.mirapolis.ru:22022/LMSSystem
  1005. * [new branch] feature/PORTAL-44642 -> origin/feature/PORTAL-44642
  1006. 17:31:57.518: [MiraFramework] git -c core.quotepath=false -c log.showSignature=false checkout release/4.6.20 --
  1007. Switched to branch 'release/4.6.20'
  1008. Your branch is behind 'origin/release/4.6.20' by 5 commits, and can be fast-forwarded.
  1009. (use "git pull" to update your local branch)
  1010. 17:31:58.480: [LMSSystem] git -c core.quotepath=false -c log.showSignature=false checkout release/4.6.20 --
  1011. error: Your local changes to the following files would be overwritten by checkout:
  1012. lms-core/src/main/java/ext/report/Report42827.java
  1013. Please commit your changes or stash them before you switch branches.
  1014. Aborting
  1015. 17:32:13.745: [MiraFramework] git -c core.quotepath=false -c log.showSignature=false checkout --force develop --
  1016. Your branch is up to date with 'origin/develop'.
  1017. Switched to branch 'develop'
  1018. 17:32:23.770: [LMSSystem] git -c core.quotepath=false -c log.showSignature=false rm --cached -f -- lms-core/src/main/java/ext/report/Report42827.java
  1019. 17:32:23.941: [LMSSystem] git -c core.quotepath=false -c log.showSignature=false checkout HEAD -- lms-core/src/main/java/ext/report/Report42827.java
  1020. 17:32:30.646: [MiraFramework] git -c core.quotepath=false -c log.showSignature=false checkout release/4.6.20 --
  1021. Your branch is behind 'origin/release/4.6.20' by 5 commits, and can be fast-forwarded.
  1022. Switched to branch 'release/4.6.20'
  1023. (use "git pull" to update your local branch)
  1024. 17:32:31.460: [LMSSystem] git -c core.quotepath=false -c log.showSignature=false checkout release/4.6.20 --
  1025. Your branch is behind 'origin/release/4.6.20' by 79 commits, and can be fast-forwarded.
  1026. Switched to branch 'release/4.6.20'
  1027. (use "git pull" to update your local branch)
  1028. 17:32:40.463: [MiraFramework] git -c core.quotepath=false -c log.showSignature=false fetch origin --progress --prune
  1029. remote: Counting objects: 98, done.
  1030. remote: Compressing objects: 100% (11/11), done.
  1031. remote: Total 12 (delta 5), reused 0 (delta 0)
  1032. From ssh://dev.mirapolis.ru:22022/MiraFramework
  1033. * [new branch] feature/PORTAL-44642 -> origin/feature/PORTAL-44642
  1034. 17:32:44.039: [LMSSystem] git -c core.quotepath=false -c log.showSignature=false fetch origin --progress --prune
  1035. remote: Counting objects: 99, done.
  1036. remote: Compressing objects: 100% (19/19), done.
  1037. remote: Total 19 (delta 10), reused 0 (delta 0)
  1038. From ssh://dev.mirapolis.ru:22022/LMSSystem
  1039. 1966174b69..b269ce7500 release/4.6.18 -> origin/release/4.6.18
  1040. 17:32:49.196: [MiraFramework] git -c core.quotepath=false -c log.showSignature=false rebase origin/release/4.6.20
  1041. First, rewinding head to replay your work on top of it...
  1042. Fast-forwarded release/4.6.20 to origin/release/4.6.20.
  1043. 17:32:51.853: [LMSSystem] git -c core.quotepath=false -c log.showSignature=false rebase origin/release/4.6.20
  1044. First, rewinding head to replay your work on top of it...
  1045. Fast-forwarded release/4.6.20 to origin/release/4.6.20.
  1046. 17:33:03.668: [MiraFramework] git -c core.quotepath=false -c log.showSignature=false checkout develop --
  1047. Your branch is up to date with 'origin/develop'.
  1048. Switched to branch 'develop'
  1049. 17:33:04.563: [LMSSystem] git -c core.quotepath=false -c log.showSignature=false checkout develop --
  1050. Switched to branch 'develop'
  1051. Your branch is up to date with 'origin/develop'.
  1052. 17:33:17.465: [MiraFramework] git -c core.quotepath=false -c log.showSignature=false fetch origin --progress --prune
  1053. 17:33:20.493: [LMSSystem] git -c core.quotepath=false -c log.showSignature=false fetch origin --progress --prune
  1054. 17:33:41.096: [LMSSystem] git -c core.quotepath=false -c log.showSignature=false merge --no-commit --no-ff remotes/origin/release/4.6.20
  1055. 17:33:57.485: [LMSSystem] git -c core.quotepath=false -c log.showSignature=false add --ignore-errors -- lms-core/src/main/resources/Resources/MessageBundles/Person_ru.properties
  1056. 17:34:23.547: [LMSSystem] git -c core.quotepath=false -c log.showSignature=false add --ignore-errors -- lms-core/src/main/java/lms/core/person/PersonMessage.java
  1057. 17:34:34.355: [LMSSystem] git -c core.quotepath=false -c log.showSignature=false commit --only -F C:\Users\Anatoly\AppData\Local\Temp\git-commit-msg-.txt -- lms-core/src/main/java/lms/core/person/PersonMessage.java lms-core/src/main/java/lms/core/person/work/deputy/ClearDeputyPersonAction.java lms-core/src/main/java/lms/core/ca/choose/ChooseCaByTypeListFrame.java lms-core/src/main/java/lms/core/person/work/deputy/PersonWorkDeputyService.java lms-core/src/main/resources/Resources/MessageBundles/Person_ru.properties
  1058. fatal: cannot do a partial commit during a merge.
  1059.  
  1060. 17:34:34.802: [LMSSystem] git -c core.quotepath=false -c log.showSignature=false commit -F C:\Users\Anatoly\AppData\Local\Temp\git-commit-msg-.txt --
  1061. [develop 43e9030084] PORTAL-43880 - [IXFIVE] Ошибка при архивации вакансии
  1062.  
  1063. 17:34:44.173: [LMSSystem] git -c core.quotepath=false -c log.showSignature=false push --progress --porcelain origin refs/heads/develop:develop
  1064. Counting objects: 16, done.
  1065. Delta compression using up to 16 threads.
  1066. Compressing objects: 100% (16/16), done.
  1067. Writing objects: 100% (16/16), 1.35 KiB | 1.35 MiB/s, done.
  1068. Total 16 (delta 12), reused 0 (delta 0)
  1069. remote: 2018-08-01 17:34:47,791 [MainThread ] [INFO ] Process push into branch refs/heads/develop
  1070. To ssh://dev.mirapolis.ru:22022/LMSSystem
  1071. refs/heads/develop:refs/heads/develop 1ba86878b1..43e9030084
  1072. Done
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!