You are viewing a plain text version of this content. The canonical link for it is here.
Posted to users@subversion.apache.org by Gerben Wierda <ge...@rna.nl> on 2007/03/13 21:13:20 UTC
lost text-base file, how to resolve?
Hello,
I keep a source tree under svn control synced between two machines
with rsync (I keep the entire /usr/local rsynced and a svn-ed source
tree is part of that). It now seems I have lost a couple of files
in .svn/text-base, probably because I added and even modified these
files on machine A and the rsynced machine B to A telling it to
delete what was not there.
Anyway, I have now the situation that the files *are* under SVN but I
cannot commit new versions.
Sending Resources-gwTeX.zip
Transmitting file data .svn: Commit failed (details follow):
svn: Can't open file '/usr/local/src/ii2/trunk/i-Packages/
texlive/.svn/text-base/Resources-gwTeX.zip.svn-base': No such file or
directory
svn: Your commit message was left in a temporary file:
svn: '/usr/local/src/ii2/trunk/i-Packages/texlive/svn-commit.2.tmp'
What is the best way to fix this problem?
G
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Re: lost text-base file, how to resolve?
Posted by Ryan Schmidt <su...@ryandesign.com>.
On Mar 13, 2007, at 16:13, Gerben Wierda wrote:
> I keep a source tree under svn control synced between two machines
> with rsync (I keep the entire /usr/local rsynced and a svn-ed
> source tree is part of that). It now seems I have lost a couple of
> files in .svn/text-base, probably because I added and even modified
> these files on machine A and the rsynced machine B to A telling it
> to delete what was not there.
>
> Anyway, I have now the situation that the files *are* under SVN but
> I cannot commit new versions.
>
> Sending Resources-gwTeX.zip
> Transmitting file data .svn: Commit failed (details follow):
> svn: Can't open file '/usr/local/src/ii2/trunk/i-Packages/
> texlive/.svn/text-base/Resources-gwTeX.zip.svn-base': No such file
> or directory
> svn: Your commit message was left in a temporary file:
> svn: '/usr/local/src/ii2/trunk/i-Packages/texlive/svn-commit.2.tmp'
>
> What is the best way to fix this problem?
Subversion philosophy is that working copies are supposed to be
discardable. If they become corrupted, you're supposed to be able to
trash them and check out a new working copy from the repository.
I realize that this is not so easy in your situation because your
working copy is /usr/local which is an important part of your OS.
I have never tried versioning a part of my system like /usr/local,
but perhaps Subversion alone is not the best choice for that task.
Have you looked into FSVS? I believe it was designed for that, and
it's based on Subversion:
http://fsvs.tigris.org/
--
To reply to the mailing list, please use your mailer's Reply To All
function
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Re: lost text-base file, how to resolve?
Posted by Gerben Wierda <ge...@rna.nl>.
On Mar 13, 2007, at 23:07 , Duncan Murdoch wrote:
> On 3/13/2007 5:13 PM, Gerben Wierda wrote:
>> Hello,
>> I keep a source tree under svn control synced between two
>> machines with rsync (I keep the entire /usr/local rsynced and a
>> svn-ed source tree is part of that). It now seems I have lost a
>> couple of files in .svn/text-base, probably because I added and
>> even modified these files on machine A and the rsynced machine B
>> to A telling it to delete what was not there.
>> Anyway, I have now the situation that the files *are* under SVN
>> but I cannot commit new versions.
>> Sending Resources-gwTeX.zip
>> Transmitting file data .svn: Commit failed (details follow):
>> svn: Can't open file '/usr/local/src/ii2/trunk/i-Packages/
>> texlive/.svn/text-base/Resources-gwTeX.zip.svn-base': No such file
>> or directory
>> svn: Your commit message was left in a temporary file:
>> svn: '/usr/local/src/ii2/trunk/i-Packages/texlive/svn-commit.
>> 2.tmp'
>> What is the best way to fix this problem?
>
> I'd check out a new copy elsewhere, copy your local mods into the
> new WC, commit from there, and then move the whole tree into
> place. Working copies don't care where they are, so this one won't
> know it was in /tmp/WC instead of /usr/local.
>
> Make sure you check out the same revision as you were working on,
> otherwise you may end up accidentally reverting some changes you
> really want.
This worked like a charm, thanks a lot.
G
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Re: lost text-base file, how to resolve?
Posted by Duncan Murdoch <mu...@stats.uwo.ca>.
On 3/13/2007 5:13 PM, Gerben Wierda wrote:
> Hello,
>
> I keep a source tree under svn control synced between two machines
> with rsync (I keep the entire /usr/local rsynced and a svn-ed source
> tree is part of that). It now seems I have lost a couple of files
> in .svn/text-base, probably because I added and even modified these
> files on machine A and the rsynced machine B to A telling it to
> delete what was not there.
>
> Anyway, I have now the situation that the files *are* under SVN but I
> cannot commit new versions.
>
> Sending Resources-gwTeX.zip
> Transmitting file data .svn: Commit failed (details follow):
> svn: Can't open file '/usr/local/src/ii2/trunk/i-Packages/
> texlive/.svn/text-base/Resources-gwTeX.zip.svn-base': No such file or
> directory
> svn: Your commit message was left in a temporary file:
> svn: '/usr/local/src/ii2/trunk/i-Packages/texlive/svn-commit.2.tmp'
>
> What is the best way to fix this problem?
I'd check out a new copy elsewhere, copy your local mods into the new
WC, commit from there, and then move the whole tree into place. Working
copies don't care where they are, so this one won't know it was in
/tmp/WC instead of /usr/local.
Make sure you check out the same revision as you were working on,
otherwise you may end up accidentally reverting some changes you really
want.
Duncan Murdoch
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org