[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: Philip Martin <philip_at_codematters.co.uk>
Date: 2002-09-09 16:29:00 CEST

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

> 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?

Are you using a Subversion older than rev 3113? The canonical "."
path handling changed in that version, several bugs like this were
fixed.

>
> 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.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.

That indicates that a merge has failed several times. If you run the
command 'svn info' on a file that is conflicted you will see the names
of the three conflict files, these are the files that will get removed
when you run 'svn resolve'. If you do something else to resolve the
conflict, say 'svn rm --force' or 'svn revert', these files do not get
deleted. We have to be a little careful about removing these files
automatically, since once they are gone they are not necessarily easy
to reproduce.

-- 
Philip Martin
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Mon Sep 9 16:29:46 2002

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