Loosing changes in Flare and SVN
Posted: Fri Apr 15, 2011 11:40 am
Flare 7, Apache SVN
We found that we loose changes in a unique scenario where the prompts from the Flare error messages are misleading. After we experienced this a few times, we caught on and we try to watch more carefully. Here's how it goes.
Bob and Roger are editing the same topic (Version 50) simultaniously. (Sure it happens, even if we sit next to each other.)
Bob finishes, saves, and checks in his changes. (Version 51)
Roger finishes later, saves and checks in his changes - Flare wisely warns us - "No files checked in due to conflicting changes".
Two choices - hit "Resolve" or hit "Auto Merge" seem like valid choices. In this unique case - We both changed the H1 - so automerge won't work - but we DIDN'T KNOW THAT.
So, we hit AutoMerge. Again Flare wisely tells us "Resolving Conflicts. Backup File Created" Hit OK.
Here's the kicker = Next message says "All Files Merged Successfully" -
Ugh - UNTRUE. It kept Roger's copy and Bob's copy is still in SVN.
Next message says "No files Checked In due to initial conflicts" - don't you feel like saying "What! Did you just tell me we merged successfully!"
At this point, Roger can accidentally OVERWRITE Bob's changes by simply doing the CheckIn step again. That's right - if Roger tries to check in his working copy a SECOND time, all will go well - it will check in and become version 52 and - Bob will be mad
when he sees his changes missing.
There may be better ideas about getting around this, but for now, we are watching what changed by using the merge tool to manually resolve the issues whenever possible.
Hope you can follow this. Good luck out there.
Roger (Bob's friend)
We found that we loose changes in a unique scenario where the prompts from the Flare error messages are misleading. After we experienced this a few times, we caught on and we try to watch more carefully. Here's how it goes.
Bob and Roger are editing the same topic (Version 50) simultaniously. (Sure it happens, even if we sit next to each other.)
Bob finishes, saves, and checks in his changes. (Version 51)
Roger finishes later, saves and checks in his changes - Flare wisely warns us - "No files checked in due to conflicting changes".
Two choices - hit "Resolve" or hit "Auto Merge" seem like valid choices. In this unique case - We both changed the H1 - so automerge won't work - but we DIDN'T KNOW THAT.
So, we hit AutoMerge. Again Flare wisely tells us "Resolving Conflicts. Backup File Created" Hit OK. Here's the kicker = Next message says "All Files Merged Successfully" -
Ugh - UNTRUE. It kept Roger's copy and Bob's copy is still in SVN. Next message says "No files Checked In due to initial conflicts" - don't you feel like saying "What! Did you just tell me we merged successfully!"
At this point, Roger can accidentally OVERWRITE Bob's changes by simply doing the CheckIn step again. That's right - if Roger tries to check in his working copy a SECOND time, all will go well - it will check in and become version 52 and - Bob will be mad
when he sees his changes missing.There may be better ideas about getting around this, but for now, we are watching what changed by using the merge tool to manually resolve the issues whenever possible.
Hope you can follow this. Good luck out there.
Roger (Bob's friend)
