[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: Get into un-cleanup-able state

From: John Szakmeister <john_at_szakmeister.net>
Date: 2003-11-05 11:44:51 CET

On Wednesday 05 November 2003 00:14, Joe Drew wrote:
> On Tue, 2003-11-04 at 23:21, kfogel@collab.net wrote:
> > Joe Drew <hoserhead@woot.net> writes:
> > > I made changes to Makefile.dep which shouldn't have been made, and in
> > > an attempt to undo those changes, I managed to make subversion unable
> > > to resolve a lock:
> > >
> > > pisces:~/cs350/cs350_090/trunk/code/test$ svn cp -r 76 Makefile.dep .
> > > svn: Problem running log
> > > svn: in directory ''
> > > svn: start_handler: error processing command 'modify-entry' in ''
> > > svn: error merge_syncing entry 'Makefile.dep'
> > > svn: Unmergeable scheduling requested on an entry
> > > svn: fold_state_changes: Entry 'Makefile.dep' already under revision
> > > control
> > > pisces:~/cs350/cs350_090/trunk/code/test$ svn cleanup
> > > svn: Problem running log
> > > svn: in directory ''
> > > svn: start_handler: error processing command 'modify-entry' in ''
> > > svn: error merge_syncing entry 'Makefile.dep'
> > > svn: Unmergeable scheduling requested on an entry
> > > svn: fold_state_changes: Entry 'Makefile.dep' already under revision
> > > control
> >
> > Oooh dang. Do you remember what you did to get into this state?
>
> Sorry I wasn't clear: the first command was what got me in this state.

I tried doing that on a local repository using file:// access, and didn't get
that problem. I got:
:: svn cp -r 10 A .
svn: Obstructed update
svn: 'A' is in the way

and this when I tried copying file to file:
:: svn cp -r 10 A A
svn: Entry already exists
svn: file 'A' already exists.

In both cases my working copy is left in a working state (I'm also running the
HEAD version). So, a couple of questions. What version are you running?
Which ra layer did you use? Can you do a fresh checkout and make this happen
again?

And FWIW, I think the preffered way of going back to a previous version is to
do something like:
:: svn merge -rBASE:76 Makefile.dep

I believe that is in the book somewhere.

-John

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Wed Nov 5 11:41:40 2003

This is an archived mail posted to the Subversion Dev mailing list.