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

Re: Question regarding merging branches

From: Ben Collins-Sussman <sussman_at_collab.net>
Date: 2002-09-09 13:58:48 CEST

"Dylan Cuthbert" <dylan@q-games.com> writes:

> $ svn merge -r 1378:1381
> http://svnserver/svn/repo/branches/test-branch/projects .
> svn: Working copy not locked
> svn: directory not locked ()

Ummm... this looks like a bug in the wc locking stuff. Philip, any
idea what's going on here?

> $ svn merge -r 1378:1381
> http://svnserver/svn/repo/branches/test-branch/projects projects
> C projects/Makefile
>
> However, I have a RIDICULOUS amount of files in the directory now:

A conflict should create a single ".working" file and two ".r*"
files. All of the *.tmp files shouldn't be there; it looks like the
working copy library got interrupted somehow, repeatedly, and left all
the .tmp garbage behind. Are you sure this was from a *single* merge
call?

>
> $ ls
> Makefile Makefile.63204.00007.tmp
> Makefile.63168.00001.working Makefile.63204.00008.tmp
> Makefile.63168.00002.working Makefile.63212.00001.tmp
> Makefile.63168.00003.working Makefile.63212.00001.tmp.63192.00001.tmp
> Makefile.63168.00004.working Makefile.63212.00001.tmp.63196.00001.tmp
> Makefile.63168.00005.working Makefile.63212.00002.tmp
> Makefile.63168.00006.working Makefile.63212.00002.tmp.63192.00001.tmp
> Makefile.63168.00007.working Makefile.63212.00002.tmp.63196.00001.tmp
> Makefile.63168.00008.working Makefile.63212.00003.tmp
> Makefile.63168.00009.working Makefile.63212.00003.tmp.63192.00001.tmp
> Makefile.63168.00010.working Makefile.63212.00003.tmp.63196.00001.tmp
> Makefile.63176.00001.r1380 Makefile.63212.00004.tmp
> Makefile.63176.00001.r1381 Makefile.63212.00004.tmp.63192.00001.tmp
> Makefile.63176.00002.r1380 Makefile.63212.00004.tmp.63196.00001.tmp
> Makefile.63176.00002.r1381 Makefile.63212.00005.tmp
> Makefile.63176.00003.r1380 Makefile.63212.00005.tmp.63192.00001.tmp
> Makefile.63176.00003.r1381 Makefile.63212.00005.tmp.63196.00001.tmp
> Makefile.63176.00004.r1381 Makefile.63212.00006.tmp
> Makefile.63176.00005.r1381 Makefile.63212.00006.tmp.63192.00001.tmp
> Makefile.63176.00006.r1381 Makefile.63212.00006.tmp.63196.00001.tmp
> Makefile.63176.00007.r1381 Makefile.63212.00007.tmp
> Makefile.63184.00001.r1377 Makefile.63212.00007.tmp.63192.00001.tmp
> Makefile.63184.00001.r1378 Makefile.63212.00007.tmp.63196.00001.tmp
> Makefile.63184.00002.r1377 Makefile.63212.00008.tmp
> Makefile.63184.00002.r1378 Makefile.63212.00008.tmp.63192.00001.tmp
> Makefile.63184.00003.r1377 Makefile.63212.00008.tmp.63196.00001.tmp
> Makefile.63184.00003.r1378
> Makefile.63184.00004.r1378
> Makefile.63184.00005.r1378
> Makefile.63184.00006.r1378
> Makefile.63184.00007.r1378
> Makefile.63204.00001.tmp
> Makefile.63204.00002.tmp
> Makefile.63204.00003.tmp
> Makefile.63204.00004.tmp
> Makefile.63204.00005.tmp
> Makefile.63204.00006.tmp

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Mon Sep 9 14:02:50 2002

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