With the new team mode, integration tests are failing. It looks like git commits are being dropped when push fails due to the remote being further ahead. Sample log:
10996: Info: Git 'clone' execution start (GIT_START)
10996: Info: Git 'clone' execution finished successfully (GIT_FINISH)
10996: Info: Git 'addForCommit' execution start (GIT_START)
10996: Info: Git 'addForCommit' execution finished successfully (GIT_FINISH)
10996: Info: Git 'upload' execution start (GIT_START)
10996: Info: Git 'upload' execution finished successfully (GIT_FINISH)
10996: Info: Git 'addForCommit' execution start (GIT_START)
10996: Info: Git 'addForCommit' execution finished successfully (GIT_FINISH)
10996: Info: Git 'upload' execution start (GIT_START)
10996: Info: Git 'upload' execution finished successfully (GIT_FINISH)
Execute: s1 14400000 /tmp/teamtest/s1 git@github.com:amake/omegat-integration-test.git 15 4
Execute: s2 14400000 /tmp/teamtest/s2 git@github.com:amake/omegat-integration-test.git 15 4
Execute: s3 14400000 /tmp/teamtest/s3 git@github.com:amake/omegat-integration-test.git 15 4
45434: Info: Git 'clone' execution start (GIT_START)
47934: Info: Git 'clone' execution start (GIT_START)
41778: Info: Git 'clone' execution start (GIT_START)
47934: Info: Git 'clone' execution finished successfully (GIT_FINISH)
41778: Info: Git 'clone' execution finished successfully (GIT_FINISH)
47934: Info: Git 'clone' execution start (GIT_START)
41778: Info: Git 'clone' execution start (GIT_START)
45434: Info: Git 'clone' execution finished successfully (GIT_FINISH)
45434: Info: Git 'clone' execution start (GIT_START)
47934: Info: Git 'clone' execution finished successfully (GIT_FINISH)
47934: Info: Source tokenizer: org.omegat.tokenizer.DefaultTokenizer
47934: Info: Target tokenizer: org.omegat.tokenizer.DefaultTokenizer
47934: Info: Project loading start (LOG_DATAENGINE_LOAD_START)
41778: Info: Git 'clone' execution finished successfully (GIT_FINISH)
41778: Info: Source tokenizer: org.omegat.tokenizer.DefaultTokenizer
41778: Info: Target tokenizer: org.omegat.tokenizer.DefaultTokenizer
41778: Info: Project loading start (LOG_DATAENGINE_LOAD_START)
45434: Info: Git 'clone' execution finished successfully (GIT_FINISH)
45434: Info: Source tokenizer: org.omegat.tokenizer.DefaultTokenizer
45434: Info: Target tokenizer: org.omegat.tokenizer.DefaultTokenizer
45434: Info: Project loading start (LOG_DATAENGINE_LOAD_START)
47934: FINE: GIT switchToVersion origin/master
47934: Info: Start rebase (TEAM_REBASE_START)
47934: FINE: Rebase and commit 'omegat/project_save.tmx'
41778: FINE: GIT switchToVersion origin/master
41778: Info: Start rebase (TEAM_REBASE_START)
41778: FINE: Rebase and commit 'omegat/project_save.tmx'
45434: FINE: GIT switchToVersion origin/master
45434: Info: Start rebase (TEAM_REBASE_START)
45434: FINE: Rebase and commit 'omegat/project_save.tmx'
41778: FINE: GIT switchToVersion origin/master
47934: FINE: GIT switchToVersion origin/master
41778: FINE: GIT switchToVersion 6d12fed04387e862b189dd2511074bb78e6417e6
47934: FINE: GIT switchToVersion 6d12fed04387e862b189dd2511074bb78e6417e6
41778: FINE: local file 'omegat/project_save.tmx' doesn't exist
47934: FINE: local file 'omegat/project_save.tmx' doesn't exist
45434: FINE: GIT switchToVersion origin/master
45434: FINE: GIT switchToVersion 6d12fed04387e862b189dd2511074bb78e6417e6
45434: FINE: local file 'omegat/project_save.tmx' doesn't exist
41778: FINE: GIT switchToVersion origin/master
41778: Info: Reading TMX file /tmp/teamtest/s1/.repositories/git_github.com_amake_omegat_integration_test.git/omegat/project_save.tmx (TMXR_INFO_READING_FILE)
41778: Info: Created by: OmegaT (TMXR_INFO_CREATION_TOOL)
41778: Info: Version: 4.0.0_0_dev (TMXR_INFO_CREATION_TOOL_VERSION)
41778: Info: Segmentation method: sentence (TMXR_INFO_SEG_TYPE)
41778: Info: Source language: en (TMXR_INFO_SOURCE_LANG)
41778: Info: Reading of TMX file complete (TMXR_INFO_READING_COMPLETE)
41778: FINE: only remote changes - get remote 'omegat/project_save.tmx'
41778: Info: Reading TMX file /tmp/teamtest/s1/omegat/project_save.tmx (TMXR_INFO_READING_FILE)
41778: Info: Created by: OmegaT (TMXR_INFO_CREATION_TOOL)
41778: Info: Version: 4.0.0_0_dev (TMXR_INFO_CREATION_TOOL_VERSION)
41778: Info: Segmentation method: sentence (TMXR_INFO_SEG_TYPE)
41778: Info: Source language: en (TMXR_INFO_SOURCE_LANG)
41778: Info: Reading of TMX file complete (TMXR_INFO_READING_COMPLETE)
41778: FINE: Rebase and commit 'glossary/glossary.txt'
47934: FINE: GIT switchToVersion origin/master
47934: Info: Reading TMX file /tmp/teamtest/s3/.repositories/git_github.com_amake_omegat_integration_test.git/omegat/project_save.tmx (TMXR_INFO_READING_FILE)
47934: Info: Created by: OmegaT (TMXR_INFO_CREATION_TOOL)
47934: Info: Version: 4.0.0_0_dev (TMXR_INFO_CREATION_TOOL_VERSION)
47934: Info: Segmentation method: sentence (TMXR_INFO_SEG_TYPE)
47934: Info: Source language: en (TMXR_INFO_SOURCE_LANG)
47934: Info: Reading of TMX file complete (TMXR_INFO_READING_COMPLETE)
47934: FINE: only remote changes - get remote 'omegat/project_save.tmx'
47934: Info: Reading TMX file /tmp/teamtest/s3/omegat/project_save.tmx (TMXR_INFO_READING_FILE)
47934: Info: Created by: OmegaT (TMXR_INFO_CREATION_TOOL)
47934: Info: Version: 4.0.0_0_dev (TMXR_INFO_CREATION_TOOL_VERSION)
47934: Info: Segmentation method: sentence (TMXR_INFO_SEG_TYPE)
47934: Info: Source language: en (TMXR_INFO_SOURCE_LANG)
47934: Info: Reading of TMX file complete (TMXR_INFO_READING_COMPLETE)
47934: FINE: Rebase and commit 'glossary/glossary.txt'
45434: FINE: GIT switchToVersion origin/master
45434: Info: Reading TMX file /tmp/teamtest/s2/.repositories/git_github.com_amake_omegat_integration_test.git/omegat/project_save.tmx (TMXR_INFO_READING_FILE)
45434: Info: Created by: OmegaT (TMXR_INFO_CREATION_TOOL)
45434: Info: Version: 4.0.0_0_dev (TMXR_INFO_CREATION_TOOL_VERSION)
45434: Info: Segmentation method: sentence (TMXR_INFO_SEG_TYPE)
45434: Info: Source language: en (TMXR_INFO_SOURCE_LANG)
45434: Info: Reading of TMX file complete (TMXR_INFO_READING_COMPLETE)
45434: FINE: only remote changes - get remote 'omegat/project_save.tmx'
45434: Info: Reading TMX file /tmp/teamtest/s2/omegat/project_save.tmx (TMXR_INFO_READING_FILE)
45434: Info: Created by: OmegaT (TMXR_INFO_CREATION_TOOL)
45434: Info: Version: 4.0.0_0_dev (TMXR_INFO_CREATION_TOOL_VERSION)
45434: Info: Segmentation method: sentence (TMXR_INFO_SEG_TYPE)
45434: Info: Source language: en (TMXR_INFO_SOURCE_LANG)
45434: Info: Reading of TMX file complete (TMXR_INFO_READING_COMPLETE)
45434: FINE: Rebase and commit 'glossary/glossary.txt'
41778: FINE: GIT switchToVersion origin/master
47934: FINE: GIT switchToVersion origin/master
45434: FINE: GIT switchToVersion origin/master
41778: FINE: GIT switchToVersion origin/master
41778: FINE: local file 'glossary/glossary.txt' doesn't exist
47934: FINE: GIT switchToVersion origin/master
47934: FINE: local file 'glossary/glossary.txt' doesn't exist
45434: FINE: GIT switchToVersion origin/master
45434: FINE: local file 'glossary/glossary.txt' doesn't exist
41778: FINE: GIT switchToVersion origin/master
41778: FINE: there are no changes 'glossary/glossary.txt'
41778: Info: End rebase (TEAM_REBASE_END)
47934: FINE: GIT switchToVersion origin/master
47934: FINE: there are no changes 'glossary/glossary.txt'
47934: Info: End rebase (TEAM_REBASE_END)
45434: FINE: GIT switchToVersion origin/master
45434: FINE: there are no changes 'glossary/glossary.txt'
45434: Info: End rebase (TEAM_REBASE_END)
41778: FINE: GIT switchToVersion origin/master
41778: Info: Load project source files: 7ms
41778: Info: Project loading end (LOG_DATAENGINE_LOAD_END)
41778: Info: Event: project change - "LOAD" (LOG_INFO_EVENT_PROJECT_CHANGE)
41778: Info: Reading TMX file /tmp/teamtest/s1/omegat/project_save.tmx (TMXR_INFO_READING_FILE)
41778: Info: Created by: OmegaT (TMXR_INFO_CREATION_TOOL)
41778: Info: Version: 4.0.0_0_dev (TMXR_INFO_CREATION_TOOL_VERSION)
41778: Info: Segmentation method: sentence (TMXR_INFO_SEG_TYPE)
41778: Info: Source language: en (TMXR_INFO_SOURCE_LANG)
41778: Info: Reading of TMX file complete (TMXR_INFO_READING_COMPLETE)
41778: Info: Event: project change - "MODIFIED" (LOG_INFO_EVENT_PROJECT_CHANGE)
47934: FINE: GIT switchToVersion origin/master
47934: Info: Load project source files: 8ms
47934: Info: Project loading end (LOG_DATAENGINE_LOAD_END)
47934: Info: Event: project change - "LOAD" (LOG_INFO_EVENT_PROJECT_CHANGE)
47934: Info: Reading TMX file /tmp/teamtest/s3/omegat/project_save.tmx (TMXR_INFO_READING_FILE)
47934: Info: Created by: OmegaT (TMXR_INFO_CREATION_TOOL)
47934: Info: Version: 4.0.0_0_dev (TMXR_INFO_CREATION_TOOL_VERSION)
47934: Info: Segmentation method: sentence (TMXR_INFO_SEG_TYPE)
47934: Info: Source language: en (TMXR_INFO_SOURCE_LANG)
47934: Info: Reading of TMX file complete (TMXR_INFO_READING_COMPLETE)
47934: Info: Event: project change - "MODIFIED" (LOG_INFO_EVENT_PROJECT_CHANGE)
45434: FINE: GIT switchToVersion origin/master
45434: Info: Load project source files: 7ms
45434: Info: Project loading end (LOG_DATAENGINE_LOAD_END)
45434: Info: Reading TMX file /tmp/teamtest/s2/omegat/project_save.tmx (TMXR_INFO_READING_FILE)
45434: Info: Event: project change - "LOAD" (LOG_INFO_EVENT_PROJECT_CHANGE)
45434: Info: Created by: OmegaT (TMXR_INFO_CREATION_TOOL)
45434: Info: Version: 4.0.0_0_dev (TMXR_INFO_CREATION_TOOL_VERSION)
45434: Info: Segmentation method: sentence (TMXR_INFO_SEG_TYPE)
45434: Info: Source language: en (TMXR_INFO_SOURCE_LANG)
45434: Info: Reading of TMX file complete (TMXR_INFO_READING_COMPLETE)
45434: Info: Event: project change - "MODIFIED" (LOG_INFO_EVENT_PROJECT_CHANGE)
47934: Info: Reading TMX file /tmp/teamtest/s3/omegat/project_save.tmx (TMXR_INFO_READING_FILE)
47934: Info: Created by: OmegaT (TMXR_INFO_CREATION_TOOL)
47934: Info: Version: 4.0.0_0_dev (TMXR_INFO_CREATION_TOOL_VERSION)
47934: Info: Segmentation method: sentence (TMXR_INFO_SEG_TYPE)
47934: Info: Source language: en (TMXR_INFO_SOURCE_LANG)
47934: Info: Reading of TMX file complete (TMXR_INFO_READING_COMPLETE)
47934: Info: Project saving start (LOG_DATAENGINE_SAVE_START)
47934: Info: Event: project change - "MODIFIED" (LOG_INFO_EVENT_PROJECT_CHANGE)
47934: Info: Start rebase (TEAM_REBASE_START)
47934: FINE: Rebase and commit 'omegat/project_save.tmx'
47934: FINE: GIT switchToVersion 6d12fed04387e862b189dd2511074bb78e6417e6
47934: FINE: local file 'omegat/project_save.tmx' was changed
47934: Info: Reading TMX file /tmp/teamtest/s3/.repositories/git_github.com_amake_omegat_integration_test.git/omegat/project_save.tmx (TMXR_INFO_READING_FILE)
47934: Info: Created by: OmegaT (TMXR_INFO_CREATION_TOOL)
47934: Info: Version: 4.0.0_0_dev (TMXR_INFO_CREATION_TOOL_VERSION)
47934: Info: Segmentation method: sentence (TMXR_INFO_SEG_TYPE)
47934: Info: Source language: en (TMXR_INFO_SOURCE_LANG)
47934: Info: Reading of TMX file complete (TMXR_INFO_READING_COMPLETE)
47934: FINE: GIT switchToVersion origin/master
47934: FINE: remote file 'omegat/project_save.tmx' wasn't changed
47934: FINE: only local changes - just use local file 'omegat/project_save.tmx'
47934: Info: Git 'addForCommit' execution start (GIT_START)
47934: Info: Git 'addForCommit' execution finished successfully (GIT_FINISH)
47934: Info: Git 'upload' execution start (GIT_START)
41778: Info: Reading TMX file /tmp/teamtest/s1/omegat/project_save.tmx (TMXR_INFO_READING_FILE)
41778: Info: Created by: OmegaT (TMXR_INFO_CREATION_TOOL)
41778: Info: Version: 4.0.0_0_dev (TMXR_INFO_CREATION_TOOL_VERSION)
41778: Info: Segmentation method: sentence (TMXR_INFO_SEG_TYPE)
41778: Info: Source language: en (TMXR_INFO_SOURCE_LANG)
41778: Info: Reading of TMX file complete (TMXR_INFO_READING_COMPLETE)
41778: Info: Project saving start (LOG_DATAENGINE_SAVE_START)
41778: Info: Event: project change - "MODIFIED" (LOG_INFO_EVENT_PROJECT_CHANGE)
41778: Info: Start rebase (TEAM_REBASE_START)
41778: FINE: Rebase and commit 'omegat/project_save.tmx'
41778: FINE: GIT switchToVersion 6d12fed04387e862b189dd2511074bb78e6417e6
41778: FINE: local file 'omegat/project_save.tmx' was changed
41778: Info: Reading TMX file /tmp/teamtest/s1/.repositories/git_github.com_amake_omegat_integration_test.git/omegat/project_save.tmx (TMXR_INFO_READING_FILE)
41778: Info: Created by: OmegaT (TMXR_INFO_CREATION_TOOL)
41778: Info: Version: 4.0.0_0_dev (TMXR_INFO_CREATION_TOOL_VERSION)
41778: Info: Segmentation method: sentence (TMXR_INFO_SEG_TYPE)
41778: Info: Source language: en (TMXR_INFO_SOURCE_LANG)
41778: Info: Reading of TMX file complete (TMXR_INFO_READING_COMPLETE)
47934: Info: Git 'upload' execution finished successfully (GIT_FINISH)
47934: Info: Reading TMX file /tmp/teamtest/s3/omegat/project_save.tmx (TMXR_INFO_READING_FILE)
47934: Info: Created by: OmegaT (TMXR_INFO_CREATION_TOOL)
47934: Info: Version: 4.0.0_0_dev (TMXR_INFO_CREATION_TOOL_VERSION)
47934: Info: Segmentation method: sentence (TMXR_INFO_SEG_TYPE)
47934: Info: Source language: en (TMXR_INFO_SOURCE_LANG)
47934: Info: Reading of TMX file complete (TMXR_INFO_READING_COMPLETE)
47934: FINE: Rebase and commit 'glossary/glossary.txt'
45434: Info: Reading TMX file /tmp/teamtest/s2/omegat/project_save.tmx (TMXR_INFO_READING_FILE)
45434: Info: Created by: OmegaT (TMXR_INFO_CREATION_TOOL)
45434: Info: Version: 4.0.0_0_dev (TMXR_INFO_CREATION_TOOL_VERSION)
45434: Info: Segmentation method: sentence (TMXR_INFO_SEG_TYPE)
45434: Info: Source language: en (TMXR_INFO_SOURCE_LANG)
45434: Info: Reading of TMX file complete (TMXR_INFO_READING_COMPLETE)
45434: Info: Project saving start (LOG_DATAENGINE_SAVE_START)
45434: Info: Event: project change - "MODIFIED" (LOG_INFO_EVENT_PROJECT_CHANGE)
45434: Info: Start rebase (TEAM_REBASE_START)
45434: FINE: Rebase and commit 'omegat/project_save.tmx'
45434: FINE: GIT switchToVersion 6d12fed04387e862b189dd2511074bb78e6417e6
45434: FINE: local file 'omegat/project_save.tmx' was changed
45434: Info: Reading TMX file /tmp/teamtest/s2/.repositories/git_github.com_amake_omegat_integration_test.git/omegat/project_save.tmx (TMXR_INFO_READING_FILE)
45434: Info: Created by: OmegaT (TMXR_INFO_CREATION_TOOL)
45434: Info: Version: 4.0.0_0_dev (TMXR_INFO_CREATION_TOOL_VERSION)
45434: Info: Segmentation method: sentence (TMXR_INFO_SEG_TYPE)
45434: Info: Source language: en (TMXR_INFO_SOURCE_LANG)
45434: Info: Reading of TMX file complete (TMXR_INFO_READING_COMPLETE)
41778: FINE: GIT switchToVersion origin/master
41778: FINE: remote file 'omegat/project_save.tmx' was changed
41778: Info: Reading TMX file /tmp/teamtest/s1/.repositories/git_github.com_amake_omegat_integration_test.git/omegat/project_save.tmx (TMXR_INFO_READING_FILE)
41778: Info: Created by: OmegaT (TMXR_INFO_CREATION_TOOL)
41778: Info: Version: 4.0.0_0_dev (TMXR_INFO_CREATION_TOOL_VERSION)
41778: Info: Segmentation method: sentence (TMXR_INFO_SEG_TYPE)
41778: Info: Source language: en (TMXR_INFO_SOURCE_LANG)
41778: Info: Reading of TMX file complete (TMXR_INFO_READING_COMPLETE)
41778: FINE: rebase and save 'omegat/project_save.tmx'
Rebase concurrent base=null head=1465271772151 project=1465271771886: result=head
41778: Info: Git 'addForCommit' execution start (GIT_START)
41778: Info: Git 'addForCommit' execution finished successfully (GIT_FINISH)
41778: Info: Git 'upload' execution start (GIT_START)
47934: FINE: GIT switchToVersion origin/master
45434: FINE: GIT switchToVersion origin/master
45434: FINE: remote file 'omegat/project_save.tmx' was changed
45434: Info: Reading TMX file /tmp/teamtest/s2/.repositories/git_github.com_amake_omegat_integration_test.git/omegat/project_save.tmx (TMXR_INFO_READING_FILE)
45434: Info: Created by: OmegaT (TMXR_INFO_CREATION_TOOL)
45434: Info: Version: 4.0.0_0_dev (TMXR_INFO_CREATION_TOOL_VERSION)
45434: Info: Segmentation method: sentence (TMXR_INFO_SEG_TYPE)
45434: Info: Source language: en (TMXR_INFO_SOURCE_LANG)
45434: Info: Reading of TMX file complete (TMXR_INFO_READING_COMPLETE)
45434: FINE: rebase and save 'omegat/project_save.tmx'
Rebase concurrent base=null head=1465271772151 project=1465271772270: result=project
45434: Info: Git 'addForCommit' execution start (GIT_START)
45434: Info: Git 'addForCommit' execution finished successfully (GIT_FINISH)
45434: Info: Git 'upload' execution start (GIT_START)
47934: FINE: GIT switchToVersion origin/master
47934: FINE: local file 'glossary/glossary.txt' doesn't exist
41778: Info: Git 'upload' execution finished successfully (GIT_FINISH)
41778: Info: Reading TMX file /tmp/teamtest/s1/omegat/project_save.tmx (TMXR_INFO_READING_FILE)
41778: Info: Created by: OmegaT (TMXR_INFO_CREATION_TOOL)
41778: Info: Version: 4.0.0_0_dev (TMXR_INFO_CREATION_TOOL_VERSION)
41778: Info: Segmentation method: sentence (TMXR_INFO_SEG_TYPE)
41778: Info: Source language: en (TMXR_INFO_SOURCE_LANG)
41778: Info: Reading of TMX file complete (TMXR_INFO_READING_COMPLETE)
41778: FINE: Rebase and commit 'glossary/glossary.txt'
45434: Warning: Push failed. Will be synchronized next time. (GIT_CONFLICT)
45434: Info: Git 'upload' execution finished successfully (GIT_FINISH)
45434: Info: Reading TMX file /tmp/teamtest/s2/omegat/project_save.tmx (TMXR_INFO_READING_FILE)
45434: Info: Created by: OmegaT (TMXR_INFO_CREATION_TOOL)
45434: Info: Version: 4.0.0_0_dev (TMXR_INFO_CREATION_TOOL_VERSION)
45434: Info: Segmentation method: sentence (TMXR_INFO_SEG_TYPE)
45434: Info: Source language: en (TMXR_INFO_SOURCE_LANG)
45434: Info: Reading of TMX file complete (TMXR_INFO_READING_COMPLETE)
45434: FINE: Rebase and commit 'glossary/glossary.txt'
47934: FINE: GIT switchToVersion origin/master
47934: FINE: there are no changes 'glossary/glossary.txt'
47934: Info: End rebase (TEAM_REBASE_END)
47934: Info: Project saving end (LOG_DATAENGINE_SAVE_END)
47934: Info: Event: project change - "SAVE" (LOG_INFO_EVENT_PROJECT_CHANGE)
47934: Info: Reading TMX file /tmp/teamtest/s3/omegat/project_save.tmx (TMXR_INFO_READING_FILE)
47934: Info: Created by: OmegaT (TMXR_INFO_CREATION_TOOL)
47934: Info: Version: 4.0.0_0_dev (TMXR_INFO_CREATION_TOOL_VERSION)
47934: Info: Segmentation method: sentence (TMXR_INFO_SEG_TYPE)
47934: Info: Source language: en (TMXR_INFO_SOURCE_LANG)
47934: Info: Reading of TMX file complete (TMXR_INFO_READING_COMPLETE)
41778: FINE: GIT switchToVersion origin/master
45434: FINE: GIT switchToVersion origin/master
41778: FINE: GIT switchToVersion origin/master
41778: FINE: local file 'glossary/glossary.txt' doesn't exist
45434: FINE: GIT switchToVersion origin/master
45434: FINE: local file 'glossary/glossary.txt' doesn't exist
41778: FINE: GIT switchToVersion origin/master
41778: FINE: there are no changes 'glossary/glossary.txt'
41778: Info: End rebase (TEAM_REBASE_END)
41778: Info: Project saving end (LOG_DATAENGINE_SAVE_END)
41778: Info: Event: project change - "SAVE" (LOG_INFO_EVENT_PROJECT_CHANGE)
41778: Info: Reading TMX file /tmp/teamtest/s1/omegat/project_save.tmx (TMXR_INFO_READING_FILE)
41778: Info: Created by: OmegaT (TMXR_INFO_CREATION_TOOL)
41778: Info: Version: 4.0.0_0_dev (TMXR_INFO_CREATION_TOOL_VERSION)
41778: Info: Segmentation method: sentence (TMXR_INFO_SEG_TYPE)
41778: Info: Source language: en (TMXR_INFO_SOURCE_LANG)
41778: Info: Reading of TMX file complete (TMXR_INFO_READING_COMPLETE)
45434: FINE: GIT switchToVersion origin/master
45434: FINE: there are no changes 'glossary/glossary.txt'
45434: Info: End rebase (TEAM_REBASE_END)
45434: Info: Project saving end (LOG_DATAENGINE_SAVE_END)
45434: Info: Event: project change - "SAVE" (LOG_INFO_EVENT_PROJECT_CHANGE)
45434: Info: Reading TMX file /tmp/teamtest/s2/omegat/project_save.tmx (TMXR_INFO_READING_FILE)
45434: Info: Created by: OmegaT (TMXR_INFO_CREATION_TOOL)
45434: Info: Version: 4.0.0_0_dev (TMXR_INFO_CREATION_TOOL_VERSION)
45434: Info: Segmentation method: sentence (TMXR_INFO_SEG_TYPE)
45434: Info: Source language: en (TMXR_INFO_SOURCE_LANG)
45434: Info: Reading of TMX file complete (TMXR_INFO_READING_COMPLETE)
47934: Info: Reading TMX file /tmp/teamtest/s3/omegat/project_save.tmx (TMXR_INFO_READING_FILE)
47934: Info: Created by: OmegaT (TMXR_INFO_CREATION_TOOL)
47934: Info: Version: 4.0.0_0_dev (TMXR_INFO_CREATION_TOOL_VERSION)
47934: Info: Segmentation method: sentence (TMXR_INFO_SEG_TYPE)
47934: Info: Source language: en (TMXR_INFO_SOURCE_LANG)
47934: Info: Reading of TMX file complete (TMXR_INFO_READING_COMPLETE)
47934: Info: Project saving start (LOG_DATAENGINE_SAVE_START)
47934: Info: Event: project change - "MODIFIED" (LOG_INFO_EVENT_PROJECT_CHANGE)
47934: Info: Start rebase (TEAM_REBASE_START)
47934: FINE: Rebase and commit 'omegat/project_save.tmx'
47934: FINE: GIT switchToVersion 550803b35eb857fa141bcddef84869a3a42e1543
47934: FINE: local file 'omegat/project_save.tmx' was changed
47934: Info: Reading TMX file /tmp/teamtest/s3/.repositories/git_github.com_amake_omegat_integration_test.git/omegat/project_save.tmx (TMXR_INFO_READING_FILE)
47934: Info: Created by: OmegaT (TMXR_INFO_CREATION_TOOL)
47934: Info: Version: 4.0.0_0_dev (TMXR_INFO_CREATION_TOOL_VERSION)
47934: Info: Segmentation method: sentence (TMXR_INFO_SEG_TYPE)
47934: Info: Source language: en (TMXR_INFO_SOURCE_LANG)
47934: Info: Reading of TMX file complete (TMXR_INFO_READING_COMPLETE)
47934: FINE: GIT switchToVersion origin/master
47934: FINE: remote file 'omegat/project_save.tmx' was changed
47934: Info: Reading TMX file /tmp/teamtest/s3/.repositories/git_github.com_amake_omegat_integration_test.git/omegat/project_save.tmx (TMXR_INFO_READING_FILE)
47934: Info: Created by: OmegaT (TMXR_INFO_CREATION_TOOL)
47934: Info: Version: 4.0.0_0_dev (TMXR_INFO_CREATION_TOOL_VERSION)
47934: Info: Segmentation method: sentence (TMXR_INFO_SEG_TYPE)
47934: Info: Source language: en (TMXR_INFO_SOURCE_LANG)
47934: Info: Reading of TMX file complete (TMXR_INFO_READING_COMPLETE)
47934: FINE: rebase and save 'omegat/project_save.tmx'
45434: Info: Reading TMX file /tmp/teamtest/s2/omegat/project_save.tmx (TMXR_INFO_READING_FILE)
45434: Info: Created by: OmegaT (TMXR_INFO_CREATION_TOOL)
45434: Info: Version: 4.0.0_0_dev (TMXR_INFO_CREATION_TOOL_VERSION)
45434: Info: Segmentation method: sentence (TMXR_INFO_SEG_TYPE)
45434: Info: Source language: en (TMXR_INFO_SOURCE_LANG)
45434: Info: Reading of TMX file complete (TMXR_INFO_READING_COMPLETE)
45434: Info: Project saving start (LOG_DATAENGINE_SAVE_START)
45434: Info: Event: project change - "MODIFIED" (LOG_INFO_EVENT_PROJECT_CHANGE)
47934: Info: Git 'addForCommit' execution start (GIT_START)
45434: Info: Start rebase (TEAM_REBASE_START)
45434: FINE: Rebase and commit 'omegat/project_save.tmx'
45434: FINE: GIT switchToVersion 7754af151a31e66404a95495ab1d74af434c50d8
47934: Info: Git 'addForCommit' execution finished successfully (GIT_FINISH)
47934: Info: Git 'upload' execution start (GIT_START)
45434: FINE: local file 'omegat/project_save.tmx' was changed
45434: Info: Reading TMX file /tmp/teamtest/s2/.repositories/git_github.com_amake_omegat_integration_test.git/omegat/project_save.tmx (TMXR_INFO_READING_FILE)
45434: Info: Created by: OmegaT (TMXR_INFO_CREATION_TOOL)
45434: Info: Version: 4.0.0_0_dev (TMXR_INFO_CREATION_TOOL_VERSION)
45434: Info: Segmentation method: sentence (TMXR_INFO_SEG_TYPE)
45434: Info: Source language: en (TMXR_INFO_SOURCE_LANG)
45434: Info: Reading of TMX file complete (TMXR_INFO_READING_COMPLETE)
45434: FINE: GIT switchToVersion origin/master
45434: FINE: remote file 'omegat/project_save.tmx' was changed
45434: Info: Reading TMX file /tmp/teamtest/s2/.repositories/git_github.com_amake_omegat_integration_test.git/omegat/project_save.tmx (TMXR_INFO_READING_FILE)
45434: Info: Created by: OmegaT (TMXR_INFO_CREATION_TOOL)
45434: Info: Version: 4.0.0_0_dev (TMXR_INFO_CREATION_TOOL_VERSION)
45434: Info: Segmentation method: sentence (TMXR_INFO_SEG_TYPE)
45434: Info: Source language: en (TMXR_INFO_SOURCE_LANG)
45434: Info: Reading of TMX file complete (TMXR_INFO_READING_COMPLETE)
45434: FINE: rebase and save 'omegat/project_save.tmx'
45434: Info: Git 'addForCommit' execution start (GIT_START)
45434: Info: Git 'addForCommit' execution finished successfully (GIT_FINISH)
45434: Info: Git 'upload' execution start (GIT_START)
47934: Info: Git 'upload' execution finished successfully (GIT_FINISH)
47934: Info: Reading TMX file /tmp/teamtest/s3/omegat/project_save.tmx (TMXR_INFO_READING_FILE)
47934: Info: Created by: OmegaT (TMXR_INFO_CREATION_TOOL)
47934: Info: Version: 4.0.0_0_dev (TMXR_INFO_CREATION_TOOL_VERSION)
47934: Info: Segmentation method: sentence (TMXR_INFO_SEG_TYPE)
47934: Info: Source language: en (TMXR_INFO_SOURCE_LANG)
47934: Info: Reading of TMX file complete (TMXR_INFO_READING_COMPLETE)
47934: FINE: Rebase and commit 'glossary/glossary.txt'
41778: Info: Reading TMX file /tmp/teamtest/s1/omegat/project_save.tmx (TMXR_INFO_READING_FILE)
41778: Info: Created by: OmegaT (TMXR_INFO_CREATION_TOOL)
41778: Info: Version: 4.0.0_0_dev (TMXR_INFO_CREATION_TOOL_VERSION)
41778: Info: Segmentation method: sentence (TMXR_INFO_SEG_TYPE)
41778: Info: Source language: en (TMXR_INFO_SOURCE_LANG)
41778: Info: Reading of TMX file complete (TMXR_INFO_READING_COMPLETE)
41778: Info: Project saving start (LOG_DATAENGINE_SAVE_START)
41778: Info: Event: project change - "MODIFIED" (LOG_INFO_EVENT_PROJECT_CHANGE)
41778: Info: Start rebase (TEAM_REBASE_START)
41778: FINE: Rebase and commit 'omegat/project_save.tmx'
41778: FINE: GIT switchToVersion 7eed1d09527a81a5907404fcc75ff959d30e64cf
41778: FINE: local file 'omegat/project_save.tmx' was changed
41778: Info: Reading TMX file /tmp/teamtest/s1/.repositories/git_github.com_amake_omegat_integration_test.git/omegat/project_save.tmx (TMXR_INFO_READING_FILE)
41778: Info: Created by: OmegaT (TMXR_INFO_CREATION_TOOL)
41778: Info: Version: 4.0.0_0_dev (TMXR_INFO_CREATION_TOOL_VERSION)
41778: Info: Segmentation method: sentence (TMXR_INFO_SEG_TYPE)
41778: Info: Source language: en (TMXR_INFO_SOURCE_LANG)
41778: Info: Reading of TMX file complete (TMXR_INFO_READING_COMPLETE)
45434: Warning: Push failed. Will be synchronized next time. (GIT_CONFLICT)
45434: Info: Git 'upload' execution finished successfully (GIT_FINISH)
45434: Info: Reading TMX file /tmp/teamtest/s2/omegat/project_save.tmx (TMXR_INFO_READING_FILE)
45434: Info: Created by: OmegaT (TMXR_INFO_CREATION_TOOL)
45434: Info: Version: 4.0.0_0_dev (TMXR_INFO_CREATION_TOOL_VERSION)
45434: Info: Segmentation method: sentence (TMXR_INFO_SEG_TYPE)
45434: Info: Source language: en (TMXR_INFO_SOURCE_LANG)
45434: Info: Reading of TMX file complete (TMXR_INFO_READING_COMPLETE)
45434: FINE: Rebase and commit 'glossary/glossary.txt'
47934: FINE: GIT switchToVersion origin/master
41778: FINE: GIT switchToVersion origin/master
41778: FINE: remote file 'omegat/project_save.tmx' was changed
41778: Info: Reading TMX file /tmp/teamtest/s1/.repositories/git_github.com_amake_omegat_integration_test.git/omegat/project_save.tmx (TMXR_INFO_READING_FILE)
41778: Info: Created by: OmegaT (TMXR_INFO_CREATION_TOOL)
41778: Info: Version: 4.0.0_0_dev (TMXR_INFO_CREATION_TOOL_VERSION)
41778: Info: Segmentation method: sentence (TMXR_INFO_SEG_TYPE)
41778: Info: Source language: en (TMXR_INFO_SOURCE_LANG)
41778: Info: Reading of TMX file complete (TMXR_INFO_READING_COMPLETE)
41778: FINE: rebase and save 'omegat/project_save.tmx'
41778: Info: Git 'addForCommit' execution start (GIT_START)
41778: Info: Git 'addForCommit' execution finished successfully (GIT_FINISH)
41778: Info: Git 'upload' execution start (GIT_START)
45434: FINE: GIT switchToVersion origin/master
47934: FINE: GIT switchToVersion origin/master
47934: FINE: local file 'glossary/glossary.txt' doesn't exist
45434: FINE: GIT switchToVersion origin/master
45434: FINE: local file 'glossary/glossary.txt' doesn't exist
41778: Info: Git 'upload' execution finished successfully (GIT_FINISH)
41778: Info: Reading TMX file /tmp/teamtest/s1/omegat/project_save.tmx (TMXR_INFO_READING_FILE)
41778: Info: Created by: OmegaT (TMXR_INFO_CREATION_TOOL)
41778: Info: Version: 4.0.0_0_dev (TMXR_INFO_CREATION_TOOL_VERSION)
41778: Info: Segmentation method: sentence (TMXR_INFO_SEG_TYPE)
41778: Info: Source language: en (TMXR_INFO_SOURCE_LANG)
41778: Info: Reading of TMX file complete (TMXR_INFO_READING_COMPLETE)
41778: FINE: Rebase and commit 'glossary/glossary.txt'
47934: FINE: GIT switchToVersion origin/master
47934: FINE: there are no changes 'glossary/glossary.txt'
47934: Info: End rebase (TEAM_REBASE_END)
47934: Info: Project saving end (LOG_DATAENGINE_SAVE_END)
47934: Info: Event: project change - "SAVE" (LOG_INFO_EVENT_PROJECT_CHANGE)
47934: Info: Reading TMX file /tmp/teamtest/s3/omegat/project_save.tmx (TMXR_INFO_READING_FILE)
47934: Info: Created by: OmegaT (TMXR_INFO_CREATION_TOOL)
47934: Info: Version: 4.0.0_0_dev (TMXR_INFO_CREATION_TOOL_VERSION)
47934: Info: Segmentation method: sentence (TMXR_INFO_SEG_TYPE)
47934: Info: Source language: en (TMXR_INFO_SOURCE_LANG)
47934: Info: Reading of TMX file complete (TMXR_INFO_READING_COMPLETE)
47934: Info: Reading TMX file /tmp/teamtest/s3/omegat/project_save.tmx (TMXR_INFO_READING_FILE)
47934: Info: Created by: OmegaT (TMXR_INFO_CREATION_TOOL)
47934: Info: Version: 4.0.0_0_dev (TMXR_INFO_CREATION_TOOL_VERSION)
47934: Info: Segmentation method: sentence (TMXR_INFO_SEG_TYPE)
47934: Info: Source language: en (TMXR_INFO_SOURCE_LANG)
47934: Info: Reading of TMX file complete (TMXR_INFO_READING_COMPLETE)
47934: Info: Event: project change - "MODIFIED" (LOG_INFO_EVENT_PROJECT_CHANGE)
45434: FINE: GIT switchToVersion origin/master
45434: FINE: there are no changes 'glossary/glossary.txt'
45434: Info: End rebase (TEAM_REBASE_END)
45434: Info: Project saving end (LOG_DATAENGINE_SAVE_END)
45434: Info: Event: project change - "SAVE" (LOG_INFO_EVENT_PROJECT_CHANGE)
45434: Info: Reading TMX file /tmp/teamtest/s2/omegat/project_save.tmx (TMXR_INFO_READING_FILE)
45434: Info: Created by: OmegaT (TMXR_INFO_CREATION_TOOL)
45434: Info: Version: 4.0.0_0_dev (TMXR_INFO_CREATION_TOOL_VERSION)
45434: Info: Segmentation method: sentence (TMXR_INFO_SEG_TYPE)
45434: Info: Source language: en (TMXR_INFO_SOURCE_LANG)
45434: Info: Reading of TMX file complete (TMXR_INFO_READING_COMPLETE)
java.lang.RuntimeException: s2: Wrong value in s2/0: expected 1 but contains null
at org.omegat.core.data.TestTeamIntegrationChild.checkTranslation(TestTeamIntegrationChild.java:223)
at org.omegat.core.data.TestTeamIntegrationChild.checkAll(TestTeamIntegrationChild.java:195)
at org.omegat.core.data.TestTeamIntegrationChild.checksavecheck(TestTeamIntegrationChild.java:185)
at org.omegat.core.data.TestTeamIntegrationChild.main(TestTeamIntegrationChild.java:155)
Error result from s2
==================== EXIT BY ERROR ====================
Fixed in trunk. Since the bug is not present in any releases yet, I will close it now.