Re: Question regarding merging branches

I tried them with the windows native version of svn, same problems, a few
less tmp files were created tho:

Makefile Makefile.64196.00001.r1381
Makefile.64104.00001.working Makefile.64196.00002.r1381
Makefile.64104.00002.working
Makefile.64108.00001.tmp
Makefile.64108.00002.tmp
Makefile.64184.00001.tmp
Makefile.64184.00001.tmp.64096.00001.tmp
Makefile.64184.00001.tmp.64100.00001.tmp
Makefile.64184.00002.tmp
Makefile.64184.00002.tmp.64096.00001.tmp
Makefile.64184.00002.tmp.64100.00001.tmp
Makefile.64192.00001.r1378
Makefile.64192.00002.r1378

Still a helluva lot, but I presume a set of 3 per version? Are they all
necessary to keep around?

I also found the windows native installer, seems to install cygwin's
diff.exe and cygwin1.dll, which is rather annoying if you already have it
installed. (and causes application errors because the dlls are different)

Regards

--
---------------------------------
Q-Games, Dylan Cuthbert.
http://www.q-games.com
P2P internet radio - http://www.peercast.org
"Dylan Cuthbert" <dylan@q-games.com> wrote in message
news:alhpo3$9g1$1@main.gmane.org...
> After more testing, I tried modifying the branch's Makefile again and I
> committed that.  The version no. rose to 1381.  The trunk's last commit
was
> 1380.
>
> I then go to the trunk's Makefile and type svn update, it says the version
> is 1381.
>
> Now I try the merge again
>
>  $ svn merge -r 1378:1381
> http://svnserver/svn/repo/branches/test-branch/projects .
> svn: Working copy not locked
> svn: directory not locked ()
>
> What does it mean?  Something to do with running the cygwin versions of
the
> commands?
>
> Anyway, I continue persevering and discover that if I issue the command
from
> the directory above it works *and* I get a conflict at last:
>
>  $ 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:
>
> $ 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
>
>
> Is this normal behaviour or is something screwed up with the cygwin port?
> The docs say that 3 files should exist and they are cleaned up by "svn
> resolve xx".  The above files aren't cleaned up when I type svn resolve
> Makefile.
>
> Anyway, can someone explain why there is a difference in behaviour between
> using "." and a directory specification?
>
> Regards
>
> ---------------------------------
> Q-Games, Dylan Cuthbert.
> http://www.q-games.com
> P2P internet radio - http://www.peercast.org
>
>
>
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
> For additional commands, e-mail: dev-help@subversion.tigris.org
>
>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org