Jump to content
Sign in to follow this  
Stephen Taylor

Phantom file changes

Recommended Posts

We are seeing quite a lot of phantom files appearing in our merged changesets.

That is when we do a merge there are files listed which haven't been touched at all in the branch we are merging into. They are legitimate files though.

This ends up causing lots of problems where artists have to merge lots of code related  files etc.. 

If binary files show up it can take a long time to process them, one at a time even though they haven't changed at all.

Do you have any idea why this is happening?

 

Cheers,

Stephen.

Share this post


Link to post
Share on other sites

Hi, 

If the files are downloaded during a merge, there should be somehow involved in the merge conflicts.

Are you using "cloaked.conf" rules? If some cloaked files are involved in the merge, they will be appearing in the workspace after the merge.

I guess you are using the Plastic GUI (not Gluon)?

Regards,

Carlos.

Share this post


Link to post
Share on other sites

Hi,

We are using a cloaked.conf and Plastic GUI.

My guess is the phantom files are the result of what we call fat branches.

That is if you have submitted something into a branch but weren't at the head and you choose to merge in the latest changes with your submit then the changeset you submit is atomically linked with the merging of some other files. If you then had a conflicted in another branch with one of the files you submitted then could files which were combined via the merge also get listed as needing merging?

Cheers,

Stephen.

Share this post


Link to post
Share on other sites

Join the conversation

You can post now and register later. If you have an account, sign in now to post with your account.

Guest
Reply to this topic...

×   Pasted as rich text.   Paste as plain text instead

  Only 75 emoji are allowed.

×   Your link has been automatically embedded.   Display as a link instead

×   Your previous content has been restored.   Clear editor

×   You cannot paste images directly. Upload or insert images from URL.

Loading...
Sign in to follow this  

×
×
  • Create New...