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.
--
Joe Drew <hoserhead@woot.net> <drew@debian.org>
My weblog doesn't detail my personal life: http://me.woot.net
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Wed Nov 5 06:19:20 2003