SVN not syncing correctly

[emsachs]

I have a bug. There is a file, TopicA, that a coworker has modified, and that I have not touched. Flare is claiming that I have modified the file, even after I deleted the file from the file system and pulled down the latest file from svn through Flare. What?

[Robotman]

It might be worth checking out the history (Show Log) of the topic using the repo-browser.

[Nita Beck]

I have a bug. There is a file, TopicA, that a coworker has modified, and that I have not touched. Flare is claiming that I have modified the file...?

I'm seeing the exact same thing in Flare 11. This is in a project that I work on only when onsite at a client's, as I otherwise cannot access the repo. This morning, upon opening the project and getting the latest files, a set of about 20 files are appearing as being modified by me, although they are topics and other files that my client's staff tech writer has been working on, while I've been offsite. This is clearly a bug, which I'll report immediately. Please make sure that you report this bug also. Meantime, I'm not sure how to resolve but will post back.

BTW, you said something about how you deleted your local copy of a file and then pulled a fresh copy from the repo. I don't think I would have done that. If you delete a file from your local copy, I would worry that Flare now thinks you want to delete that file in the repo, too.

UPDATE: Through very careful experimentation/observation and in consultation with my client's staff tech writer, we determined that my versions of the files that were falsely shown as modified by me were actually showing content as it existed BEFORE she had modified the files. So if I were to commit my versions of the files, I would be obliterating all the changes she had made since I was last onsite. I ended up reverting all the files. That way, they now matched the versions in the repo, my co-author having confirmed that those were her last-modified versions.

[doc_guy]

Yes, reverting your files to the version in the repo is the best solution here, until the bug is fixed.

Just for a clarification: if you delete the file OUTSIDE Flare (i.e. not using the SVN delete command), then SVN doesn't know that the file was deleted, so it continues to live in the repo, and you can pull it back down to your local system.

If you delete a file IN Flare, and tell it to remove it from the repo, then Flare sends the SVN delete command, and marks the file as being deleted in the repository. Even if that occurred, you could still pull the file back by reverting your SVN to a version before the file was deleted. So, once a file is committed to SVN it is never truly deleted. You can always go back and get it later, if needed (though it can be a pain to find out where it was deleted).

[Nita Beck]

@doc-guy. As always, I bow to your superior knowledge! In all seriousness, thanks for posting to the betterment of us all.

[doc_guy]

Nita, you always make me smile.

[Nita Beck]

Paul, so long as you're not laughing up your sleeve!