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

Re: Why does merge skip files?!?

From: Gre7g Luterman <gre7g_at_kyoht.com>
Date: 2005-10-06 01:01:07 CEST

Nevermind. I still don't know why svn was unhappy, but the following
seems to have appeased it:

gre7g@7[4732]$ rm -rf trunk; svn update
A trunk
A trunk/test1


Updated to revision 97.
gre7g@7[4732]$ svn merge -r32:HEAD branches/dummy trunk
A trunk/test1/test1
A trunk/test1/test1.c


So I guess if anyone encounters this problem, try reloading your tree
from scratch. It seems to clean SOMETHING up that svn update


On 5 Oct 2005 at 14:22, users@subversion.tigris.org wrote:

> I searched the archive for answers on this one, but it seems like
> everyone else who has been having this problem has been comparing a
> branch against the trunk. I don't think I'm making that same
> mistake, but I'm obviously doing something wrong!
> gre7g@7[4732]$ svn --version
> svn, version 1.2.3 (r15833)
> compiled Oct 5 2005, 12:26:18
> <snipped>
> The original branch was made quite a while ago. The changes are now
> quite extensive.
> gre7g@7[4732]$ svn log --stop-on-copy branches/dummy | tail -n 8
> r32 | gre7g | 2005-08-15 21:23:09 -0600 (Mon, 15 Aug 2005) | 5 lines
> Branched trunk to dummy at revision #31.
> Now I can safely add in code to supply dummy data in the absence of a
> data acquisition card.
> ---------------------------------------------------------------------
> I've never merged this branch back, so I want to take all the changes
> from 32:HEAD in dummy and add them into trunk. It seems like I
> should type:
> gre7g@7[4732]$ svn merge -r32:HEAD branches/dummy trunk
> Skipped 'trunk/test1/test1'
> U trunk/test1/test1.c
> Skipped 'trunk/test1/emulator'
> Skipped 'trunk/test1/emulator.c'
> U trunk/test1/Makefile
> A trunk/web_server
> A trunk/web_server/source
> Skipped 'trunk/web_server/source/export.cgi'
> Skipped 'trunk/web_server/source/ipaddr.c'
> <snipped>
> Why is it skipping these darn files? If I do this merge on my
> Windows box with TortoiseSVN, it merges just fine, but I really want
> to do the development on my Linux box. Grrr.
> Does anyone know what I'm messing up? I haven't even changed the
> trunk since I made the branch. I could just move branches/dummy back
> to trunk, but I really want to understand this so when I get to a
> project with other developers then I will not mess anything up.
> Gre7g

To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Thu Oct 6 01:03:06 2005

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.