Unsynced changes have been merged to commit

SubGit
#1

We are one-way syncing GitLab to SVN, and we see this happening on a few different repositories. The sync will fail, but when we look at the messages, it says it is resolved.

The following commit could not be synchronized with Subversion repository
and has been rolled back:
0f23e46: refs/heads/master moved to refs/subgit/unsynced/heads/master/1

To recover from the out of sync state:

  1. Fetch commit notes by running the following command in your working tree:
    $ git fetch origin +refs/notes/subgit/unsynced:refs/notes/subgit/unsynced

  2. Fetch unsynced commits:
    $ git fetch origin +refs/subgit/unsynced/heads/master/1:refs/subgit/unsynced/heads/master/1

  3. Follow recovery instructions:
    $ git show --notes=subgit/unsynced refs/subgit/unsynced/heads/master/1

To /home/username/repofolder.git
3f404d6…f965f04 master -> master

[username@server repofolder]$ git fetch origin +refs/notes/subgit/unsynced:refs/notes/subgit/unsynced
remote: Counting objects: 7, done.
remote: Compressing objects: 100% (5/5), done.
remote: Total 5 (delta 3), reused 0 (delta 0)
Unpacking objects: 100% (5/5), done.
From /home/username/repofolder
516c995…adce3be refs/notes/subgit/unsynced -> refs/notes/subgit/unsynced

[username@server repofolder]$ git fetch origin +refs/subgit/unsynced/heads/master/1:refs/subgit/unsynced/heads/master/1

[username@server repofolder]$ git show --notes=subgit/unsynced refs/subgit/unsynced/heads/master/1
commit 0f23e465aabdcfebb67b2aaeed8feffb09594fa4
Merge: 79cba3b 2044222
Author: Firstname Lastname FL@company.com
Date: Wed Apr 15 10:34:04 2020 -0400

Merging qa to master

Notes (subgit/unsynced):
Conflict has been resolved:

Unsynced changes have been merged to commit 'e314557f6f004aa7ff7933668705bb65c7e3dfbe' and translated to revision 61290

This breaks our CI pipeline for no reason since the changes were actually synced. Has anyone else experienced this? Is there a way to stop this from happening?

#2

Hi Matt,

we would need to investigate it further, may I ask you to collect logs from the affected GitLab repository and send them ti us? Also, could you advise how the one-way mirror syncing is established – nobody just commits to SVN, you’re using separate Git namespaces for mirror or some other way?