I am unable to commit any file or files to Boost-sandbox\math_toolkit with the following message. (I have tried an update and it does it OK). Modified: I:\Boost-sandbox\math_toolkit\boost\math\policy\policy.hpp Sending content: I:\Boost-sandbox\math_toolkit\boost\math\policy\policy.hpp Error: Commit failed (details follow): Error: MERGE request failed on '/svn/boost/sandbox/math_toolkit/boost/math/policy' Error: 'pre-commit' hook failed with error output: (nothing follows error output:) Update to I:\Boost-sandbox\math_toolkit\boost\math\policy\error_handling.hpp Completed: At revision: 38396 Modified: I:\Boost-sandbox\math_toolkit\boost\math\policy\error_handling.hpp Sending content: I:\Boost-sandbox\math_toolkit\boost\math\policy\error_handling.hpp Error: Commit failed (details follow): Error: Cannot write to the prototype revision file of transaction '38396-1' because a previous representation is currently being written by this process Any suggestions? Patience and re-try? Thanks Paul --- Paul A Bristow Prizet Farmhouse, Kendal, Cumbria UK LA8 8AB +44 1539561830 & SMS, Mobile +44 7714 330204 & SMS pbristow@hetp.u-net.com
On Aug 2, 2007, at 9:53 AM, Paul A Bristow wrote:
I am unable to commit any file or files to Boost-sandbox \math_toolkit with the following message.
Did you perform a clean check-out after 7PM EDT yesterday? If not, I'm guessing that's the problem. You can "svn diff > p" in your old Subversion checkout then "patch - p0 < p" in your new Subversion checkout to move over any changes. - Doug
Doug Gregor wrote:
On Aug 2, 2007, at 9:53 AM, Paul A Bristow wrote:
I am unable to commit any file or files to Boost-sandbox \math_toolkit with the following message.
Did you perform a clean check-out after 7PM EDT yesterday? If not, I'm guessing that's the problem.
You can "svn diff > p" in your old Subversion checkout then "patch - p0 < p" in your new Subversion checkout to move over any changes.
Paul's trying to commit to the sandbox, which I don't think should have this issue? Certainly I've been able to commit to the sandbox this morning without any problems, although I admit I did clean out the "branches" and "trunk" directories first and re-obtain these as per your instructions. John.
-----Original Message----- From: boost-bounces@lists.boost.org [mailto:boost-bounces@lists.boost.org] On Behalf Of Doug Gregor Sent: 02 August 2007 17:18 To: boost@lists.boost.org Subject: Re: [boost] SVN problem with commit
On Aug 2, 2007, at 9:53 AM, Paul A Bristow wrote:
I am unable to commit any file or files to Boost-sandbox \math_toolkit with the following message.
Did you perform a clean check-out after 7PM EDT yesterday? If not, I'm guessing that's the problem.
You can "svn diff > p" in your old Subversion checkout then "patch - p0 < p" in your new Subversion checkout to move over any changes.
Is there a way for a poor ancient oligo-neuronic Windows user to do this with Tortoise SVN, or do I have to RTFM the SVN command line interface? (There are hundreds of change to hundreds of files in tens of sub-directories:-( ) Thanks! Paul --- Paul A Bristow Prizet Farmhouse, Kendal, Cumbria UK LA8 8AB +44 1539561830 & SMS, Mobile +44 7714 330204 & SMS pbristow@hetp.u-net.com
If you are diffing trees, beyond compare (wrote:http://www.scootersoftware.com/) is well worth the small fee. There are other tree difference utilities too.
Is there a way for a poor ancient oligo-neuronic Windows user to do this with Tortoise SVN, or do I have to RTFM the SVN command line interface?
(There are hundreds of change to hundreds of files in tens of sub-directories:-( )
On Aug 2, 2007, at 12:51 PM, Paul A Bristow wrote:
Is there a way for a poor ancient oligo-neuronic Windows user to do this with Tortoise SVN, or do I have to RTFM the SVN command line interface?
(There are hundreds of change to hundreds of files in tens of sub- directories:-( )
In TortoiseSVN's context menu, there is a "Create patch" option and an "Apply patch" option. You should be able to "Create patch" in your old tree and then "Apply patch" on that patch in the new tree. It's the same operation that I described. I'm really, really sorry that you got stuck doing this. - Doug
-----Original Message----- From: boost-bounces@lists.boost.org [mailto:boost-bounces@lists.boost.org] On Behalf Of Doug Gregor Sent: 02 August 2007 18:53 To: boost@lists.boost.org Subject: Re: [boost] SVN problem with commit
On Aug 2, 2007, at 12:51 PM, Paul A Bristow wrote:
Is there a way for a poor ancient oligo-neuronic Windows user to do this with Tortoise SVN, or do I have to RTFM the SVN command line interface?
(There are hundreds of change to hundreds of files in tens of sub- directories:-( )
In TortoiseSVN's context menu, there is a "Create patch" option and an "Apply patch" option. You should be able to "Create patch" in your old tree and then "Apply patch" on that patch in the new tree. It's the same operation that I described.
I'm really, really sorry that you got stuck doing this.
Thanks - I'll take a backup and give it a whirl. Thanks for the hassle of managing SVN AND novices like me! Paul
-----Original Message----- From: boost-bounces@lists.boost.org [mailto:boost-bounces@lists.boost.org] On Behalf Of Doug Gregor Sent: 02 August 2007 18:53 To: boost@lists.boost.org Subject: Re: [boost] SVN problem with commit
On Aug 2, 2007, at 12:51 PM, Paul A Bristow wrote:
Is there a way for a poor ancient oligo-neuronic Windows user to do this with Tortoise SVN, or do I have to RTFM the SVN command line interface?
(There are hundreds of change to hundreds of files in tens of sub- directories:-( )
In TortoiseSVN's context menu, there is a "Create patch" option and an "Apply patch" option. You should be able to "Create patch" in your old tree and then "Apply patch" on that patch in the new tree. It's the same operation that I described.
After a brief cardiac assert when I got a message: "An unknown line type was found in line 90059!" using a full diff (5 Mbyte) of ALL the files. I then tried a diff created from only the files selected by Tortoise SVN to create the diff (0.5 Mbyte), and all now appears to be well from a brief inspection and a re-run of some tests. I could then commit these updated files OK, as before. And I await John's confirmation that my many changes are correct. Thanks for your invaluable help. Paul --- Paul A Bristow Prizet Farmhouse, Kendal, Cumbria UK LA8 8AB +44 1539561830 & SMS, Mobile +44 7714 330204 & SMS pbristow@hetp.u-net.com
2007/8/2, Doug Gregor <dgregor@osl.iu.edu>:
Did you perform a clean check-out after 7PM EDT yesterday? If not, I'm guessing that's the problem.
Can you explain why a clean checkout is needed? What is it that subversion does not handle in a normal update? Will this be needed now and then? /$
On Aug 2, 2007, at 4:21 PM, Henrik Sundberg wrote:
2007/8/2, Doug Gregor <dgregor@osl.iu.edu>:
Did you perform a clean check-out after 7PM EDT yesterday? If not, I'm guessing that's the problem.
Can you explain why a clean checkout is needed?
Because I re-imported all of Boost CVS in that last down-time, to correct the MIME type problems caused by bugs in the CVS->Subversion script.
What is it that subversion does not handle in a normal update?
Getting the repository switched from underneath it.
Will this be needed now and then?
It should never be needed again. This was a particularly strange case. - Doug
participants (5)
-
Brian Schrom -
Doug Gregor -
Henrik Sundberg -
John Maddock -
Paul A Bristow