-
Notifications
You must be signed in to change notification settings - Fork 3
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Better Progress Monitoring #10
Comments
Partly done. Committed even though it is only partly done to reduce the number of possible merge conflicts. Status:
|
I just uploaded my latest changes. There were several merge conflicts, so I had to revert a few things. (I had already done translatable strings, and I had refactored synchronization.) I kept all of your new progress monitoring code except for a few places inside the sync call. I copied it, though, for later reference. |
you copied it where? And why did you not keep all in the sync call? |
I simply copied it to a text file so I can have it if I need it later while working on the monitor. It looks like the only monitor code I didn't include is:
I wasn't sure where to place this code (our implementations were quite different), and I didn't know what its purpose was. |
you made another mistake. You removed the finally blocked. The tryLock loop replaces lock(). It aquires the lock but allows the Please don't just leave things out in a merge. If you are not sure than ask On Wed, May 11, 2011 at 1:50 PM, eblen <
ORNL/UT Center for Molecular Biophysics cmb.ornl.gov |
Which finally block? The finally block in sync that unlocks the lock was still there. The best solution is to avoid complex merges altogether, which means we should commit and upload frequently. I wasn't able to upload until this morning (more network problems - I can explain later.) So I had two days of work in one commit. Had I committed earlier, it would have all been much simpler. Oh well, live and learn... |
On Wed, May 11, 2011 at 3:43 PM, eblen <
ORNL/UT Center for Molecular Biophysics cmb.ornl.gov |
The progress monitor for sync'ing is never updated. Also, progress monitoring for other operations, such as git operations or build operations, may also need to be improved.
The text was updated successfully, but these errors were encountered: