Thanks,
I have tried svn up (many times). I am getting a different error
message (sorry if I did not catch this last time). You see I have a
file that used to be revision controlled and now I need it to be
revision controlled again.
This is what I do:
svn up; works ok, does not restore the file in quesion because it is
not (any longer) revision controlled
svn status; shows the file that I will be adding with the '?' which
means that it is not revision controlled.
svn add 'file_in_quesion'; this works ok so far
snv commit; problems!
Adding 'file_in_question'
Transmitting file data .svn: Commit failed (details follow):
svn: File already exists: filesystem '/home/pauld/svn/db', transaction
'23', path '/trunk/file_in_question'
svn: Your commit message was left in a temporary file:
svn: '/home/pauld/work/svn-commit.tmp'
I hope this is more clear. I think perhaps I have confused people by
not noticing the change in error message (sorry).
Anyway, does anyone have any ideas? I'm googling the answer, but not
much seems to be coming up.
Thanks,
Paul
On 2/2/06, Gale, David <David.Gale@hypertherm.com> wrote:
> Paul Dumais wrote:
> > Thanks for the help.
> >
> > This does not work though since svn up does nothing to my working
> > copy. Why would it since I deleted the file from the repository? It
> > seems that the repository has a file with the file name I want to use,
> > however the file is not at HEAD. Therefore svn up will not give update
> > the file. Howver, for some reason it will not leat me add a file with
> > the same name to the repository without complaining that it has a file
> > already that it wants me to update. Very strange. Perhaps I have to
> > expunge this file from all older revisions first? Another option might
> > be to get the files in question back into HEAD, update, then try
> > again.
> >
> > Very puzzling.
> >
> > Paul
> >
> > On 2/2/06, Marc Haisenko <haisenko@comdasys.com> wrote:
> >> On Thursday 02 February 2006 00:24, Paul Dumais wrote:
> >>> Adding work.leo
> >>> svn: Commit failed (details follow):
> >>> svn: Out of date: '/trunk/work.leo' in transaction '22'
> >>> svn: Your commit message was left in a temporary file:
> >>> svn: '/home/pauld/work/svn-commit.tmp'
> >>>
> >>> whenever I do an svn commit
> >>>
> >>> I had previously removed the work.leo file from revision control.
> >>> Now it will not let me add it again. It seems counter-intuitive
> >>> that there should be an out of date error when there should be no
> >>> such file in the HEAD of the repository. How can I use this file
> >>> name once again?
> >>>
> >>> Thanks,
> >>>
> >>> Paul
> >>
> >> This message normally means you want to check in a file which
> >> changes since you've checked it out. Just do an "svn up" and resolve
> >> any conflicts if any occure, then check in.
>
> Did you actually *try* doing an svn up, or do you just think that it
> won't work?
>
> Given the error message, svn up should clear your problem.
>
> -David
>
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Thu Feb 2 19:58:09 2006