From: Chambers, M. <mat...@gm...> - 2015-07-27 15:29:46
|
Nick, I think you should have the latest working copy since you had to commit 8698. But I see Brendan made a couple commits yesterday. Do we need to worry about getting the commits back in a similar order, or can I commit some of my own changes now? -Matt On 7/26/2015 5:43 PM, SourceForge Support wrote: > SourceForge experienced a storage fault on 2015-07-16. Service restoration > has been in-progress since that time, and our latest full status update is online at: > http://sourceforge.net/blog/sourceforge-infrastructure-and-service-restoration-update-for-724/ > > > Subversion data has generally been restored to the 2015-07-14 backup. We have identified > 497 Subversion repositories which received commits after 2015-07-13 and before the storage fault. > Your project, proteowizard, is one of those repositories. > > > To determine which repositories are missing recent commits, we compared the > revision count currently in your repository on disk (Current revision on disk) > to the revision count seen by our repository tracking (Current revision in database). > The repository tracking database does not house a full copy of your commit data. > We determined data needed to be committed again because the Current revision > on disk is less than the Current revision in database. > > > Analysis of your repository compared to our SCM repository tracking data shows: > Current revision on disk: 8688 > Current revision in database: 8698 > > > Recent commit events tracked in database: > r8663 brendanx Mon Jul 13 2015 01:00:34 GMT+0000 (UTC) Skyline: Test for Retry, Skip, Cancel message o... > r8664 nickshulman Mon Jul 13 2015 18:20:46 GMT+0000 (UTC) Merge from trunk > r8665 nickshulman Mon Jul 13 2015 18:27:36 GMT+0000 (UTC) Merge from trunk > r8666 nickshulman Mon Jul 13 2015 18:29:58 GMT+0000 (UTC) Manually fix problem with merge revisions > r8667 nickshulman Mon Jul 13 2015 19:28:50 GMT+0000 (UTC) Merge from trunk > r8668 alexmac2 Mon Jul 13 2015 19:55:12 GMT+0000 (UTC) Skyline: Add graph properties to allow user con... > r8669 nickshulman Mon Jul 13 2015 20:21:53 GMT+0000 (UTC) Fix enabling of preview button > r8670 chambm Mon Jul 13 2015 21:02:16 GMT+0000 (UTC) * added Excel Interop as a nuget package > r8671 alexmac2 Mon Jul 13 2015 21:37:18 GMT+0000 (UTC) skyline: fixed graph font sizes > r8672 nickshulman Mon Jul 13 2015 21:43:30 GMT+0000 (UTC) Add some comments. > r8673 chambm Mon Jul 13 2015 21:46:08 GMT+0000 (UTC) * removed SharpSvn reference and commented out ... > r8674 brendanx Mon Jul 13 2015 22:00:15 GMT+0000 (UTC) Topograph: Fix Topograph to implement new IProg... > r8675 nickshulman Mon Jul 13 2015 22:17:57 GMT+0000 (UTC) merge from trunk > r8676 chambm Mon Jul 13 2015 22:19:33 GMT+0000 (UTC) * removed SharpSvn reference for real > r8677 nickshulman Tue Jul 14 2015 03:57:53 GMT+0000 (UTC) Fix Skyline//InspectCode errors. > r8678 brendanx Tue Jul 14 2015 05:07:55 GMT+0000 (UTC) Skyline: Fix race condition in ImportFailureTest > r8679 chambm Tue Jul 14 2015 15:30:53 GMT+0000 (UTC) * commented out SharpSvn DLLs from WIX template > r8680 chambm Tue Jul 14 2015 17:22:00 GMT+0000 (UTC) * removed reference to Office PIA DLL > r8681 alexmac2 Tue Jul 14 2015 18:30:09 GMT+0000 (UTC) Skyline: font size change for Dot Product Labels > r8682 chambm Tue Jul 14 2015 19:26:46 GMT+0000 (UTC) * fixed TeamCity test decoration issue in freicore > r8683 nickshulman Tue Jul 14 2015 20:23:44 GMT+0000 (UTC) Fix bad merge > r8684 nickshulman Tue Jul 14 2015 20:31:46 GMT+0000 (UTC) Merge from trunk > r8685 nickshulman Tue Jul 14 2015 20:36:04 GMT+0000 (UTC) Manually change merge revisions. > r8686 nickshulman Tue Jul 14 2015 21:57:05 GMT+0000 (UTC) "TestSmallMolecules" was missing from "Settings... > r8687 nickshulman Tue Jul 14 2015 22:04:45 GMT+0000 (UTC) Merge from trunk > r8688 brendanx Wed Jul 15 2015 01:01:18 GMT+0000 (UTC) Skyline: Fix Sciex isolation window parameters > r8689 nickshulman Wed Jul 15 2015 20:35:53 GMT+0000 (UTC) CenterParent on DocumentSettingsDlg > r8690 pcbrefugee Wed Jul 15 2015 21:52:05 GMT+0000 (UTC) Skyline (small molecule work branch) merge from... > r8691 nickshulman Wed Jul 15 2015 21:59:31 GMT+0000 (UTC) Missed files from previous checkin > r8692 nickshulman Wed Jul 15 2015 22:00:50 GMT+0000 (UTC) Merge from trunk > r8693 brendanx Wed Jul 15 2015 22:47:02 GMT+0000 (UTC) Skyline: Fix multi-molecule graphs for small mo... > r8694 nickshulman Wed Jul 15 2015 23:31:03 GMT+0000 (UTC) Fix NullReferenceException in LiveResultsGrid > r8695 nickshulman Wed Jul 15 2015 23:34:51 GMT+0000 (UTC) Remove grip handle from ChooseViewsControl > r8696 pcbrefugee Wed Jul 15 2015 23:49:27 GMT+0000 (UTC) Skyline (small molecule work branch) merge from... > r8697 pcbrefugee Thu Jul 16 2015 00:02:50 GMT+0000 (UTC) Skyline: Test for verifying "Issue 379: Small m... > r8698 nickshulman Thu Jul 16 2015 00:10:11 GMT+0000 (UTC) Fix exception customizing view on FoldChangeGrid. > > > > > Since commits were made to your repository after our restore point, it will be necessary > for you to coordinate within your team to ensure these changes are recommitted. > > > We recommend you make a backup of your existing repository checkout, then make > a fresh checkout of the repository in another directory, copy over any changes > and commit. Depending on the number of developers on your team and the granularity > of change tracking you need for these uncommitted changes, you may need to tune > this process for your project. Please coordinate with the other developers on > your project team before committing. > > > If you have any follow-up questions or concerns, please contact the > SourceForge Support team by submitting a ticket at: > https://sourceforge.net/p/forge/site-support/new/ > > > Thank you, > > > SourceForge Support |
From: Brian P. <bs...@pr...> - 2015-07-27 15:42:47
|
Intuitively it seems like reproducing the order is a good idea, though to be honest I haven't thought that through properly. Having just come back from a week off that probably puts me squarely in the critical path. Luckily my commits are mostly on a branch. I think I need to go read up on how to deal with this situation, where the database and the filestore disagree - unless somebody here already knows the drill. Brian On Mon, Jul 27, 2015 at 8:29 AM, Chambers, Matthew < mat...@gm...> wrote: > Nick, > > I think you should have the latest working copy since you had to commit > 8698. But I see Brendan made a couple commits yesterday. Do we need to > worry about getting the commits back in a similar order, or can I commit > some of my own changes now? > > -Matt > > > On 7/26/2015 5:43 PM, SourceForge Support wrote: > > SourceForge experienced a storage fault on 2015-07-16. Service > restoration > > has been in-progress since that time, and our latest full status update > is online at: > > > http://sourceforge.net/blog/sourceforge-infrastructure-and-service-restoration-update-for-724/ > > > > > > Subversion data has generally been restored to the 2015-07-14 backup. > We have identified > > 497 Subversion repositories which received commits after 2015-07-13 and > before the storage fault. > > Your project, proteowizard, is one of those repositories. > > > > > > To determine which repositories are missing recent commits, we compared > the > > revision count currently in your repository on disk (Current revision on > disk) > > to the revision count seen by our repository tracking (Current revision > in database). > > The repository tracking database does not house a full copy of your > commit data. > > We determined data needed to be committed again because the Current > revision > > on disk is less than the Current revision in database. > > > > > > Analysis of your repository compared to our SCM repository tracking data > shows: > > Current revision on disk: 8688 > > Current revision in database: 8698 > > > > > > Recent commit events tracked in database: > > r8663 brendanx Mon Jul 13 2015 01:00:34 GMT+0000 (UTC) Skyline: > Test for Retry, Skip, Cancel message o... > > r8664 nickshulman Mon Jul 13 2015 18:20:46 GMT+0000 (UTC) Merge from > trunk > > r8665 nickshulman Mon Jul 13 2015 18:27:36 GMT+0000 (UTC) Merge from > trunk > > r8666 nickshulman Mon Jul 13 2015 18:29:58 GMT+0000 (UTC) Manually > fix problem with merge revisions > > r8667 nickshulman Mon Jul 13 2015 19:28:50 GMT+0000 (UTC) Merge from > trunk > > r8668 alexmac2 Mon Jul 13 2015 19:55:12 GMT+0000 (UTC) Skyline: > Add graph properties to allow user con... > > r8669 nickshulman Mon Jul 13 2015 20:21:53 GMT+0000 (UTC) Fix > enabling of preview button > > r8670 chambm Mon Jul 13 2015 21:02:16 GMT+0000 (UTC) * added Excel > Interop as a nuget package > > r8671 alexmac2 Mon Jul 13 2015 21:37:18 GMT+0000 (UTC) skyline: > fixed graph font sizes > > r8672 nickshulman Mon Jul 13 2015 21:43:30 GMT+0000 (UTC) Add some > comments. > > r8673 chambm Mon Jul 13 2015 21:46:08 GMT+0000 (UTC) * removed SharpSvn > reference and commented out ... > > r8674 brendanx Mon Jul 13 2015 22:00:15 GMT+0000 (UTC) Topograph: > Fix Topograph to implement new IProg... > > r8675 nickshulman Mon Jul 13 2015 22:17:57 GMT+0000 (UTC) merge from > trunk > > r8676 chambm Mon Jul 13 2015 22:19:33 GMT+0000 (UTC) * removed SharpSvn > reference for real > > r8677 nickshulman Tue Jul 14 2015 03:57:53 GMT+0000 (UTC) Fix > Skyline//InspectCode errors. > > r8678 brendanx Tue Jul 14 2015 05:07:55 GMT+0000 (UTC) Skyline: > Fix race condition in ImportFailureTest > > r8679 chambm Tue Jul 14 2015 15:30:53 GMT+0000 (UTC) * commented out > SharpSvn DLLs from WIX template > > r8680 chambm Tue Jul 14 2015 17:22:00 GMT+0000 (UTC) * removed > reference to Office PIA DLL > > r8681 alexmac2 Tue Jul 14 2015 18:30:09 GMT+0000 (UTC) Skyline: > font size change for Dot Product Labels > > r8682 chambm Tue Jul 14 2015 19:26:46 GMT+0000 (UTC) * fixed TeamCity > test decoration issue in freicore > > r8683 nickshulman Tue Jul 14 2015 20:23:44 GMT+0000 (UTC) Fix bad > merge > > r8684 nickshulman Tue Jul 14 2015 20:31:46 GMT+0000 (UTC) Merge from > trunk > > r8685 nickshulman Tue Jul 14 2015 20:36:04 GMT+0000 (UTC) Manually > change merge revisions. > > r8686 nickshulman Tue Jul 14 2015 21:57:05 GMT+0000 (UTC) > "TestSmallMolecules" was missing from "Settings... > > r8687 nickshulman Tue Jul 14 2015 22:04:45 GMT+0000 (UTC) Merge from > trunk > > r8688 brendanx Wed Jul 15 2015 01:01:18 GMT+0000 (UTC) Skyline: > Fix Sciex isolation window parameters > > r8689 nickshulman Wed Jul 15 2015 20:35:53 GMT+0000 (UTC) > CenterParent on DocumentSettingsDlg > > r8690 pcbrefugee Wed Jul 15 2015 21:52:05 GMT+0000 (UTC) Skyline > (small molecule work branch) merge from... > > r8691 nickshulman Wed Jul 15 2015 21:59:31 GMT+0000 (UTC) Missed > files from previous checkin > > r8692 nickshulman Wed Jul 15 2015 22:00:50 GMT+0000 (UTC) Merge from > trunk > > r8693 brendanx Wed Jul 15 2015 22:47:02 GMT+0000 (UTC) Skyline: > Fix multi-molecule graphs for small mo... > > r8694 nickshulman Wed Jul 15 2015 23:31:03 GMT+0000 (UTC) Fix > NullReferenceException in LiveResultsGrid > > r8695 nickshulman Wed Jul 15 2015 23:34:51 GMT+0000 (UTC) Remove > grip handle from ChooseViewsControl > > r8696 pcbrefugee Wed Jul 15 2015 23:49:27 GMT+0000 (UTC) Skyline > (small molecule work branch) merge from... > > r8697 pcbrefugee Thu Jul 16 2015 00:02:50 GMT+0000 (UTC) Skyline: > Test for verifying "Issue 379: Small m... > > r8698 nickshulman Thu Jul 16 2015 00:10:11 GMT+0000 (UTC) Fix > exception customizing view on FoldChangeGrid. > > > > > > > > > > Since commits were made to your repository after our restore point, it > will be necessary > > for you to coordinate within your team to ensure these changes are > recommitted. > > > > > > We recommend you make a backup of your existing repository checkout, > then make > > a fresh checkout of the repository in another directory, copy over any > changes > > and commit. Depending on the number of developers on your team and the > granularity > > of change tracking you need for these uncommitted changes, you may need > to tune > > this process for your project. Please coordinate with the other > developers on > > your project team before committing. > > > > > > If you have any follow-up questions or concerns, please contact the > > SourceForge Support team by submitting a ticket at: > > https://sourceforge.net/p/forge/site-support/new/ > > > > > > Thank you, > > > > > > SourceForge Support > > > > ------------------------------------------------------------------------------ > _______________________________________________ > proteowizard-developer mailing list > pro...@li... > https://lists.sourceforge.net/lists/listinfo/proteowizard-developer > |
From: Chambers, M. <mat...@gm...> - 2015-07-27 15:47:52
|
Fortunately I don't think it's that complicated. We don't have to deal with repository metadata that's out of sync with its file store. SF restored the metadata and the filestore to the latest version available. But they had even later metadata, which they used to inform us which commits are missing in the recovered repository. So whoever has that code just needs to recommit it. But I too am not sure about reproducing the order. Brendan, you've already made some commits, so perhaps you can comment? -Matt On 7/27/2015 10:42 AM, Brian Pratt wrote: > Intuitively it seems like reproducing the order is a good idea, though > to be honest I haven't thought that through properly. > > Having just come back from a week off that probably puts me squarely > in the critical path. Luckily my commits are mostly on a branch. > > I think I need to go read up on how to deal with this situation, where > the database and the filestore disagree - unless somebody here already > knows the drill. > > Brian > > On Mon, Jul 27, 2015 at 8:29 AM, Chambers, Matthew > <mat...@gm... <mailto:mat...@gm...>> wrote: > > Nick, > > I think you should have the latest working copy since you had to > commit > 8698. But I see Brendan made a couple commits yesterday. Do we need to > worry about getting the commits back in a similar order, or can I > commit > some of my own changes now? > > -Matt > > > On 7/26/2015 5:43 PM, SourceForge Support wrote: > > SourceForge experienced a storage fault on 2015-07-16. Service > restoration > > has been in-progress since that time, and our latest full status > update is online at: > > > http://sourceforge.net/blog/sourceforge-infrastructure-and-service-restoration-update-for-724/ > > > > > > Subversion data has generally been restored to the 2015-07-14 > backup. We have identified > > 497 Subversion repositories which received commits after > 2015-07-13 and before the storage fault. > > Your project, proteowizard, is one of those repositories. > > > > > > To determine which repositories are missing recent commits, we > compared the > > revision count currently in your repository on disk (Current > revision on disk) > > to the revision count seen by our repository tracking (Current > revision in database). > > The repository tracking database does not house a full copy of > your commit data. > > We determined data needed to be committed again because the > Current revision > > on disk is less than the Current revision in database. > > > > > > Analysis of your repository compared to our SCM repository > tracking data shows: > > Current revision on disk: 8688 > > Current revision in database: 8698 > > > > > > Recent commit events tracked in database: > > r8663 brendanx Mon Jul 13 2015 01:00:34 GMT+0000 (UTC) > Skyline: Test for Retry, Skip, Cancel message o... > > r8664 nickshulman Mon Jul 13 2015 18:20:46 GMT+0000 (UTC) > Merge from trunk > > r8665 nickshulman Mon Jul 13 2015 18:27:36 GMT+0000 (UTC) > Merge from trunk > > r8666 nickshulman Mon Jul 13 2015 18:29:58 GMT+0000 (UTC) > Manually fix problem with merge revisions > > r8667 nickshulman Mon Jul 13 2015 19:28:50 GMT+0000 (UTC) > Merge from trunk > > r8668 alexmac2 Mon Jul 13 2015 19:55:12 GMT+0000 (UTC) > Skyline: Add graph properties to allow user con... > > r8669 nickshulman Mon Jul 13 2015 20:21:53 GMT+0000 (UTC) > Fix enabling of preview button > > r8670 chambm Mon Jul 13 2015 21:02:16 GMT+0000 (UTC) * added > Excel Interop as a nuget package > > r8671 alexmac2 Mon Jul 13 2015 21:37:18 GMT+0000 (UTC) > skyline: fixed graph font sizes > > r8672 nickshulman Mon Jul 13 2015 21:43:30 GMT+0000 (UTC) > Add some comments. > > r8673 chambm Mon Jul 13 2015 21:46:08 GMT+0000 (UTC) * removed > SharpSvn reference and commented out ... > > r8674 brendanx Mon Jul 13 2015 22:00:15 GMT+0000 (UTC) > Topograph: Fix Topograph to implement new IProg... > > r8675 nickshulman Mon Jul 13 2015 22:17:57 GMT+0000 (UTC) > merge from trunk > > r8676 chambm Mon Jul 13 2015 22:19:33 GMT+0000 (UTC) * removed > SharpSvn reference for real > > r8677 nickshulman Tue Jul 14 2015 03:57:53 GMT+0000 (UTC) > Fix Skyline//InspectCode errors. > > r8678 brendanx Tue Jul 14 2015 05:07:55 GMT+0000 (UTC) > Skyline: Fix race condition in ImportFailureTest > > r8679 chambm Tue Jul 14 2015 15:30:53 GMT+0000 (UTC) * > commented out SharpSvn DLLs from WIX template > > r8680 chambm Tue Jul 14 2015 17:22:00 GMT+0000 (UTC) * removed > reference to Office PIA DLL > > r8681 alexmac2 Tue Jul 14 2015 18:30:09 GMT+0000 (UTC) > Skyline: font size change for Dot Product Labels > > r8682 chambm Tue Jul 14 2015 19:26:46 GMT+0000 (UTC) * fixed > TeamCity test decoration issue in freicore > > r8683 nickshulman Tue Jul 14 2015 20:23:44 GMT+0000 (UTC) > Fix bad merge > > r8684 nickshulman Tue Jul 14 2015 20:31:46 GMT+0000 (UTC) > Merge from trunk > > r8685 nickshulman Tue Jul 14 2015 20:36:04 GMT+0000 (UTC) > Manually change merge revisions. > > r8686 nickshulman Tue Jul 14 2015 21:57:05 GMT+0000 (UTC) > "TestSmallMolecules" was missing from "Settings... > > r8687 nickshulman Tue Jul 14 2015 22:04:45 GMT+0000 (UTC) > Merge from trunk > > r8688 brendanx Wed Jul 15 2015 01:01:18 GMT+0000 (UTC) > Skyline: Fix Sciex isolation window parameters > > r8689 nickshulman Wed Jul 15 2015 20:35:53 GMT+0000 (UTC) > CenterParent on DocumentSettingsDlg > > r8690 pcbrefugee Wed Jul 15 2015 21:52:05 GMT+0000 (UTC) > Skyline (small molecule work branch) merge from... > > r8691 nickshulman Wed Jul 15 2015 21:59:31 GMT+0000 (UTC) > Missed files from previous checkin > > r8692 nickshulman Wed Jul 15 2015 22:00:50 GMT+0000 (UTC) > Merge from trunk > > r8693 brendanx Wed Jul 15 2015 22:47:02 GMT+0000 (UTC) > Skyline: Fix multi-molecule graphs for small mo... > > r8694 nickshulman Wed Jul 15 2015 23:31:03 GMT+0000 (UTC) > Fix NullReferenceException in LiveResultsGrid > > r8695 nickshulman Wed Jul 15 2015 23:34:51 GMT+0000 (UTC) > Remove grip handle from ChooseViewsControl > > r8696 pcbrefugee Wed Jul 15 2015 23:49:27 GMT+0000 (UTC) > Skyline (small molecule work branch) merge from... > > r8697 pcbrefugee Thu Jul 16 2015 00:02:50 GMT+0000 (UTC) > Skyline: Test for verifying "Issue 379: Small m... > > r8698 nickshulman Thu Jul 16 2015 00:10:11 GMT+0000 (UTC) > Fix exception customizing view on FoldChangeGrid. > > > > > > > > > > Since commits were made to your repository after our restore > point, it will be necessary > > for you to coordinate within your team to ensure these changes > are recommitted. > > > > > > We recommend you make a backup of your existing repository > checkout, then make > > a fresh checkout of the repository in another directory, copy > over any changes > > and commit. Depending on the number of developers on your team > and the granularity > > of change tracking you need for these uncommitted changes, you > may need to tune > > this process for your project. Please coordinate with the other > developers on > > your project team before committing. > > > > > > If you have any follow-up questions or concerns, please contact the > > SourceForge Support team by submitting a ticket at: > > https://sourceforge.net/p/forge/site-support/new/ > > > > > > Thank you, > > > > > > SourceForge Support > > > ------------------------------------------------------------------------------ > _______________________________________________ > proteowizard-developer mailing list > pro...@li... > <mailto:pro...@li...> > https://lists.sourceforge.net/lists/listinfo/proteowizard-developer > > |
From: Brendan M. <bre...@pr...> - 2015-07-27 18:12:45
|
I used WinDiff on my existing local source against a clean checkout. It worked like a charm, and should work for anyone else with a checkout that is ahead of the repository. You get this error when you have that: Command: Update Updating: C:\proj\pwiz Error: No such reported revision '8693' found in the repository. Completed!: So, I guess we should be careful not to overrun our latest version numbers before everyone has committed the differences. But, I think Nick and Brian could just update to the latest non-new revision (mine on trunk or the head of Brian's branch) and then use WinDiff as I did to do a recursive directory comparison and update things that differ. Hopefully we can get that all taken care of in the next few hours. I will work with Nick and Brian. I don't think it should matter much if you commit in areas we aren't working on, but if you can wait a few hours, that might help to avoid confusion. --Brendan On Mon, Jul 27, 2015 at 8:47 AM, Chambers, Matthew < mat...@gm...> wrote: > Fortunately I don't think it's that complicated. We don't have to deal > with repository metadata that's out of sync with its file store. SF > restored the metadata and the filestore to the latest version available. > But they had even later metadata, which they used to inform us which > commits are missing in the recovered repository. So whoever has that code > just needs to recommit it. But I too am not sure about reproducing the > order. Brendan, you've already made some commits, so perhaps you can > comment? > > -Matt > > > On 7/27/2015 10:42 AM, Brian Pratt wrote: > > Intuitively it seems like reproducing the order is a good idea, though to > be honest I haven't thought that through properly. > > Having just come back from a week off that probably puts me squarely in > the critical path. Luckily my commits are mostly on a branch. > > I think I need to go read up on how to deal with this situation, where > the database and the filestore disagree - unless somebody here already > knows the drill. > > Brian > > On Mon, Jul 27, 2015 at 8:29 AM, Chambers, Matthew < > <mat...@gm...>mat...@gm...> wrote: > >> Nick, >> >> I think you should have the latest working copy since you had to commit >> 8698. But I see Brendan made a couple commits yesterday. Do we need to >> worry about getting the commits back in a similar order, or can I commit >> some of my own changes now? >> >> -Matt >> >> >> On 7/26/2015 5:43 PM, SourceForge Support wrote: >> > SourceForge experienced a storage fault on 2015-07-16. Service >> restoration >> > has been in-progress since that time, and our latest full status update >> is online at: >> > >> http://sourceforge.net/blog/sourceforge-infrastructure-and-service-restoration-update-for-724/ >> > >> > >> > Subversion data has generally been restored to the 2015-07-14 backup. >> We have identified >> > 497 Subversion repositories which received commits after 2015-07-13 and >> before the storage fault. >> > Your project, proteowizard, is one of those repositories. >> > >> > >> > To determine which repositories are missing recent commits, we compared >> the >> > revision count currently in your repository on disk (Current revision >> on disk) >> > to the revision count seen by our repository tracking (Current revision >> in database). >> > The repository tracking database does not house a full copy of your >> commit data. >> > We determined data needed to be committed again because the Current >> revision >> > on disk is less than the Current revision in database. >> > >> > >> > Analysis of your repository compared to our SCM repository tracking >> data shows: >> > Current revision on disk: 8688 >> > Current revision in database: 8698 >> > >> > >> > Recent commit events tracked in database: >> > r8663 brendanx Mon Jul 13 2015 01:00:34 GMT+0000 (UTC) Skyline: >> Test for Retry, Skip, Cancel message o... >> > r8664 nickshulman Mon Jul 13 2015 18:20:46 GMT+0000 (UTC) Merge >> from trunk >> > r8665 nickshulman Mon Jul 13 2015 18:27:36 GMT+0000 (UTC) Merge >> from trunk >> > r8666 nickshulman Mon Jul 13 2015 18:29:58 GMT+0000 (UTC) Manually >> fix problem with merge revisions >> > r8667 nickshulman Mon Jul 13 2015 19:28:50 GMT+0000 (UTC) Merge >> from trunk >> > r8668 alexmac2 Mon Jul 13 2015 19:55:12 GMT+0000 (UTC) Skyline: >> Add graph properties to allow user con... >> > r8669 nickshulman Mon Jul 13 2015 20:21:53 GMT+0000 (UTC) Fix >> enabling of preview button >> > r8670 chambm Mon Jul 13 2015 21:02:16 GMT+0000 (UTC) * added Excel >> Interop as a nuget package >> > r8671 alexmac2 Mon Jul 13 2015 21:37:18 GMT+0000 (UTC) skyline: >> fixed graph font sizes >> > r8672 nickshulman Mon Jul 13 2015 21:43:30 GMT+0000 (UTC) Add some >> comments. >> > r8673 chambm Mon Jul 13 2015 21:46:08 GMT+0000 (UTC) * removed >> SharpSvn reference and commented out ... >> > r8674 brendanx Mon Jul 13 2015 22:00:15 GMT+0000 (UTC) >> Topograph: Fix Topograph to implement new IProg... >> > r8675 nickshulman Mon Jul 13 2015 22:17:57 GMT+0000 (UTC) merge >> from trunk >> > r8676 chambm Mon Jul 13 2015 22:19:33 GMT+0000 (UTC) * removed >> SharpSvn reference for real >> > r8677 nickshulman Tue Jul 14 2015 03:57:53 GMT+0000 (UTC) Fix >> Skyline//InspectCode errors. >> > r8678 brendanx Tue Jul 14 2015 05:07:55 GMT+0000 (UTC) Skyline: >> Fix race condition in ImportFailureTest >> > r8679 chambm Tue Jul 14 2015 15:30:53 GMT+0000 (UTC) * commented out >> SharpSvn DLLs from WIX template >> > r8680 chambm Tue Jul 14 2015 17:22:00 GMT+0000 (UTC) * removed >> reference to Office PIA DLL >> > r8681 alexmac2 Tue Jul 14 2015 18:30:09 GMT+0000 (UTC) Skyline: >> font size change for Dot Product Labels >> > r8682 chambm Tue Jul 14 2015 19:26:46 GMT+0000 (UTC) * fixed TeamCity >> test decoration issue in freicore >> > r8683 nickshulman Tue Jul 14 2015 20:23:44 GMT+0000 (UTC) Fix bad >> merge >> > r8684 nickshulman Tue Jul 14 2015 20:31:46 GMT+0000 (UTC) Merge >> from trunk >> > r8685 nickshulman Tue Jul 14 2015 20:36:04 GMT+0000 (UTC) Manually >> change merge revisions. >> > r8686 nickshulman Tue Jul 14 2015 21:57:05 GMT+0000 (UTC) >> "TestSmallMolecules" was missing from "Settings... >> > r8687 nickshulman Tue Jul 14 2015 22:04:45 GMT+0000 (UTC) Merge >> from trunk >> > r8688 brendanx Wed Jul 15 2015 01:01:18 GMT+0000 (UTC) Skyline: >> Fix Sciex isolation window parameters >> > r8689 nickshulman Wed Jul 15 2015 20:35:53 GMT+0000 (UTC) >> CenterParent on DocumentSettingsDlg >> > r8690 pcbrefugee Wed Jul 15 2015 21:52:05 GMT+0000 (UTC) Skyline >> (small molecule work branch) merge from... >> > r8691 nickshulman Wed Jul 15 2015 21:59:31 GMT+0000 (UTC) Missed >> files from previous checkin >> > r8692 nickshulman Wed Jul 15 2015 22:00:50 GMT+0000 (UTC) Merge >> from trunk >> > r8693 brendanx Wed Jul 15 2015 22:47:02 GMT+0000 (UTC) Skyline: >> Fix multi-molecule graphs for small mo... >> > r8694 nickshulman Wed Jul 15 2015 23:31:03 GMT+0000 (UTC) Fix >> NullReferenceException in LiveResultsGrid >> > r8695 nickshulman Wed Jul 15 2015 23:34:51 GMT+0000 (UTC) Remove >> grip handle from ChooseViewsControl >> > r8696 pcbrefugee Wed Jul 15 2015 23:49:27 GMT+0000 (UTC) Skyline >> (small molecule work branch) merge from... >> > r8697 pcbrefugee Thu Jul 16 2015 00:02:50 GMT+0000 (UTC) Skyline: >> Test for verifying "Issue 379: Small m... >> > r8698 nickshulman Thu Jul 16 2015 00:10:11 GMT+0000 (UTC) Fix >> exception customizing view on FoldChangeGrid. >> > >> > >> > >> > >> > Since commits were made to your repository after our restore point, it >> will be necessary >> > for you to coordinate within your team to ensure these changes are >> recommitted. >> > >> > >> > We recommend you make a backup of your existing repository checkout, >> then make >> > a fresh checkout of the repository in another directory, copy over any >> changes >> > and commit. Depending on the number of developers on your team and the >> granularity >> > of change tracking you need for these uncommitted changes, you may need >> to tune >> > this process for your project. Please coordinate with the other >> developers on >> > your project team before committing. >> > >> > >> > If you have any follow-up questions or concerns, please contact the >> > SourceForge Support team by submitting a ticket at: >> > https://sourceforge.net/p/forge/site-support/new/ >> > >> > >> > Thank you, >> > >> > >> > SourceForge Support >> >> >> >> ------------------------------------------------------------------------------ >> _______________________________________________ >> proteowizard-developer mailing list >> pro...@li... >> https://lists.sourceforge.net/lists/listinfo/proteowizard-developer >> > > > > > ------------------------------------------------------------------------------ > > _______________________________________________ > proteowizard-developer mailing list > pro...@li... > https://lists.sourceforge.net/lists/listinfo/proteowizard-developer > > |
From: Joseph S. <Jos...@sy...> - 2015-07-27 18:19:49
|
Brendan, I've also found Meld (http://meldmerge.org/) to be a decent enough tool for doing these sort of diffs. -Joe On Mon, Jul 27, 2015 at 11:04 AM, Brendan MacLean <bre...@pr...> wrote: > I used WinDiff on my existing local source against a clean checkout. It > worked like a charm, and should work for anyone else with a checkout that > is ahead of the repository. You get this error when you have that: > > Command: Update > Updating: C:\proj\pwiz > Error: No such reported revision '8693' found in the repository. > Completed!: > > So, I guess we should be careful not to overrun our latest version numbers > before everyone has committed the differences. But, I think Nick and Brian > could just update to the latest non-new revision (mine on trunk or the head > of Brian's branch) and then use WinDiff as I did to do a recursive > directory comparison and update things that differ. > > Hopefully we can get that all taken care of in the next few hours. I will > work with Nick and Brian. I don't think it should matter much if you commit > in areas we aren't working on, but if you can wait a few hours, that might > help to avoid confusion. > > --Brendan > > On Mon, Jul 27, 2015 at 8:47 AM, Chambers, Matthew < > mat...@gm...> wrote: > >> Fortunately I don't think it's that complicated. We don't have to deal >> with repository metadata that's out of sync with its file store. SF >> restored the metadata and the filestore to the latest version available. >> But they had even later metadata, which they used to inform us which >> commits are missing in the recovered repository. So whoever has that code >> just needs to recommit it. But I too am not sure about reproducing the >> order. Brendan, you've already made some commits, so perhaps you can >> comment? >> >> -Matt >> >> >> On 7/27/2015 10:42 AM, Brian Pratt wrote: >> >> Intuitively it seems like reproducing the order is a good idea, though to >> be honest I haven't thought that through properly. >> >> Having just come back from a week off that probably puts me squarely in >> the critical path. Luckily my commits are mostly on a branch. >> >> I think I need to go read up on how to deal with this situation, where >> the database and the filestore disagree - unless somebody here already >> knows the drill. >> >> Brian >> >> On Mon, Jul 27, 2015 at 8:29 AM, Chambers, Matthew < >> <mat...@gm...>mat...@gm...> wrote: >> >>> Nick, >>> >>> I think you should have the latest working copy since you had to commit >>> 8698. But I see Brendan made a couple commits yesterday. Do we need to >>> worry about getting the commits back in a similar order, or can I commit >>> some of my own changes now? >>> >>> -Matt >>> >>> >>> On 7/26/2015 5:43 PM, SourceForge Support wrote: >>> > SourceForge experienced a storage fault on 2015-07-16. Service >>> restoration >>> > has been in-progress since that time, and our latest full status >>> update is online at: >>> > >>> http://sourceforge.net/blog/sourceforge-infrastructure-and-service-restoration-update-for-724/ >>> > >>> > >>> > Subversion data has generally been restored to the 2015-07-14 backup. >>> We have identified >>> > 497 Subversion repositories which received commits after 2015-07-13 >>> and before the storage fault. >>> > Your project, proteowizard, is one of those repositories. >>> > >>> > >>> > To determine which repositories are missing recent commits, we >>> compared the >>> > revision count currently in your repository on disk (Current revision >>> on disk) >>> > to the revision count seen by our repository tracking (Current >>> revision in database). >>> > The repository tracking database does not house a full copy of your >>> commit data. >>> > We determined data needed to be committed again because the Current >>> revision >>> > on disk is less than the Current revision in database. >>> > >>> > >>> > Analysis of your repository compared to our SCM repository tracking >>> data shows: >>> > Current revision on disk: 8688 >>> > Current revision in database: 8698 >>> > >>> > >>> > Recent commit events tracked in database: >>> > r8663 brendanx Mon Jul 13 2015 01:00:34 GMT+0000 (UTC) Skyline: >>> Test for Retry, Skip, Cancel message o... >>> > r8664 nickshulman Mon Jul 13 2015 18:20:46 GMT+0000 (UTC) Merge >>> from trunk >>> > r8665 nickshulman Mon Jul 13 2015 18:27:36 GMT+0000 (UTC) Merge >>> from trunk >>> > r8666 nickshulman Mon Jul 13 2015 18:29:58 GMT+0000 (UTC) Manually >>> fix problem with merge revisions >>> > r8667 nickshulman Mon Jul 13 2015 19:28:50 GMT+0000 (UTC) Merge >>> from trunk >>> > r8668 alexmac2 Mon Jul 13 2015 19:55:12 GMT+0000 (UTC) Skyline: >>> Add graph properties to allow user con... >>> > r8669 nickshulman Mon Jul 13 2015 20:21:53 GMT+0000 (UTC) Fix >>> enabling of preview button >>> > r8670 chambm Mon Jul 13 2015 21:02:16 GMT+0000 (UTC) * added Excel >>> Interop as a nuget package >>> > r8671 alexmac2 Mon Jul 13 2015 21:37:18 GMT+0000 (UTC) skyline: >>> fixed graph font sizes >>> > r8672 nickshulman Mon Jul 13 2015 21:43:30 GMT+0000 (UTC) Add some >>> comments. >>> > r8673 chambm Mon Jul 13 2015 21:46:08 GMT+0000 (UTC) * removed >>> SharpSvn reference and commented out ... >>> > r8674 brendanx Mon Jul 13 2015 22:00:15 GMT+0000 (UTC) >>> Topograph: Fix Topograph to implement new IProg... >>> > r8675 nickshulman Mon Jul 13 2015 22:17:57 GMT+0000 (UTC) merge >>> from trunk >>> > r8676 chambm Mon Jul 13 2015 22:19:33 GMT+0000 (UTC) * removed >>> SharpSvn reference for real >>> > r8677 nickshulman Tue Jul 14 2015 03:57:53 GMT+0000 (UTC) Fix >>> Skyline//InspectCode errors. >>> > r8678 brendanx Tue Jul 14 2015 05:07:55 GMT+0000 (UTC) Skyline: >>> Fix race condition in ImportFailureTest >>> > r8679 chambm Tue Jul 14 2015 15:30:53 GMT+0000 (UTC) * commented out >>> SharpSvn DLLs from WIX template >>> > r8680 chambm Tue Jul 14 2015 17:22:00 GMT+0000 (UTC) * removed >>> reference to Office PIA DLL >>> > r8681 alexmac2 Tue Jul 14 2015 18:30:09 GMT+0000 (UTC) Skyline: >>> font size change for Dot Product Labels >>> > r8682 chambm Tue Jul 14 2015 19:26:46 GMT+0000 (UTC) * fixed TeamCity >>> test decoration issue in freicore >>> > r8683 nickshulman Tue Jul 14 2015 20:23:44 GMT+0000 (UTC) Fix bad >>> merge >>> > r8684 nickshulman Tue Jul 14 2015 20:31:46 GMT+0000 (UTC) Merge >>> from trunk >>> > r8685 nickshulman Tue Jul 14 2015 20:36:04 GMT+0000 (UTC) Manually >>> change merge revisions. >>> > r8686 nickshulman Tue Jul 14 2015 21:57:05 GMT+0000 (UTC) >>> "TestSmallMolecules" was missing from "Settings... >>> > r8687 nickshulman Tue Jul 14 2015 22:04:45 GMT+0000 (UTC) Merge >>> from trunk >>> > r8688 brendanx Wed Jul 15 2015 01:01:18 GMT+0000 (UTC) Skyline: >>> Fix Sciex isolation window parameters >>> > r8689 nickshulman Wed Jul 15 2015 20:35:53 GMT+0000 (UTC) >>> CenterParent on DocumentSettingsDlg >>> > r8690 pcbrefugee Wed Jul 15 2015 21:52:05 GMT+0000 (UTC) Skyline >>> (small molecule work branch) merge from... >>> > r8691 nickshulman Wed Jul 15 2015 21:59:31 GMT+0000 (UTC) Missed >>> files from previous checkin >>> > r8692 nickshulman Wed Jul 15 2015 22:00:50 GMT+0000 (UTC) Merge >>> from trunk >>> > r8693 brendanx Wed Jul 15 2015 22:47:02 GMT+0000 (UTC) Skyline: >>> Fix multi-molecule graphs for small mo... >>> > r8694 nickshulman Wed Jul 15 2015 23:31:03 GMT+0000 (UTC) Fix >>> NullReferenceException in LiveResultsGrid >>> > r8695 nickshulman Wed Jul 15 2015 23:34:51 GMT+0000 (UTC) Remove >>> grip handle from ChooseViewsControl >>> > r8696 pcbrefugee Wed Jul 15 2015 23:49:27 GMT+0000 (UTC) Skyline >>> (small molecule work branch) merge from... >>> > r8697 pcbrefugee Thu Jul 16 2015 00:02:50 GMT+0000 (UTC) Skyline: >>> Test for verifying "Issue 379: Small m... >>> > r8698 nickshulman Thu Jul 16 2015 00:10:11 GMT+0000 (UTC) Fix >>> exception customizing view on FoldChangeGrid. >>> > >>> > >>> > >>> > >>> > Since commits were made to your repository after our restore point, it >>> will be necessary >>> > for you to coordinate within your team to ensure these changes are >>> recommitted. >>> > >>> > >>> > We recommend you make a backup of your existing repository checkout, >>> then make >>> > a fresh checkout of the repository in another directory, copy over any >>> changes >>> > and commit. Depending on the number of developers on your team and the >>> granularity >>> > of change tracking you need for these uncommitted changes, you may >>> need to tune >>> > this process for your project. Please coordinate with the other >>> developers on >>> > your project team before committing. >>> > >>> > >>> > If you have any follow-up questions or concerns, please contact the >>> > SourceForge Support team by submitting a ticket at: >>> > https://sourceforge.net/p/forge/site-support/new/ >>> > >>> > >>> > Thank you, >>> > >>> > >>> > SourceForge Support >>> >>> >>> >>> ------------------------------------------------------------------------------ >>> _______________________________________________ >>> proteowizard-developer mailing list >>> pro...@li... >>> https://lists.sourceforge.net/lists/listinfo/proteowizard-developer >>> >> >> >> >> >> ------------------------------------------------------------------------------ >> >> _______________________________________________ >> proteowizard-developer mailing list >> pro...@li... >> https://lists.sourceforge.net/lists/listinfo/proteowizard-developer >> >> > > > ------------------------------------------------------------------------------ > > _______________________________________________ > proteowizard-developer mailing list > pro...@li... > https://lists.sourceforge.net/lists/listinfo/proteowizard-developer > > -- Joe Slagel Institute for Systems Biology js...@sy... |