Previously reverted changes reappearing in file; untracked and without diffs

Unity Services
,
1

Hi,

We have an issue with UVC where a file in our repo has had changes that were previously reverted appear back in the file, but with no corresponding version control change or diff. The file in question is an asset, and all changes made to it were done through the editor. In the abstract, here’s what has occurred:

  • File created, numerous changes (~25) are made to it over a period of time (~2 years)
  • Dev modifies file to make 3 changes. UVC correctly shows this change and correctly identifies 3 diffs within it.
  • Dev modifies file to revert the 3 changes. UVC correctly shows this change and correctly identifies 3 diffs with the previous changes reverted. A find-in-file on this change for the reverted text correctly shows no results. Note: This revert was done via changing the affected settings in the editor, not via subtractive merge.
  • Dev makes unrelated change to the same asset. UVC shows 2 diffs within this change, both unrelated to changes in steps 2 and 3. A find-in-file on this change shows the changes made in step 2, and reverted in step 3, are now once again present in the file.

To be clear - the changes that were reverted in step 3 are present again in the file after step 4, but are not shown as a diff.

How is this possible? This sets a really worrying precedent for the rest of our project using UVC - if these changes are untracked and somehow “ghosted” back into the file, what else could be happening in the thousands of files in our codebase?

Please advise as to how this situation can occur.

2

Hi,

  • In step 2) did you checkin the changes?
  • In step 3) did you checkin the changes?

Did you run the “Revert file to this revision” action at some point?

If some changes do not appear in the diff, it normally means the previous revision already contained these changes. The diff view is showing diff with previous revisions in the branch.

If you open a ticket with us, we can arrange a meeting to further debug what could be happening:
devops-vcs-support@unity3d.com

3

The changes made in steps 2 and 3 were both submitted, and the changes show in the History of the file. To the best of my knowledge we have not run a “Revert file to this revision” action on this file.

I’ll open a ticket, thanks.