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

merge "Skipped" many subfolders

From: Jeff Smith <jsmith_at_robotronics.com>
Date: 2007-01-30 21:46:22 CET

I don't understand this thing merge is doing. Someone else had this
problem where they merged, wiped the working copy, checked out a new
working copy, and found that some subdirectories were missing.

Well, this is the problem. I thought it was supposed to add all new
folders from the merge, but below I see it "Skipped" a lot of things,
although it did copy them to the merge target. Why are they not
added?

------------
svn merge -r 45:48 svn://localhost/robo/vendor/FreeRTOS
------------
U Source/include/FreeRTOS.h
U Source/include/list.h
U Source/include/projdefs.h
U Source/include/semphr.h
U Source/include/task.h
U Source/include/queue.h
U Source/include/croutine.h
C Source/include/portable.h
U Source/queue.c
U Source/tasks.c
[...]
A Source/portable/Paradigm
A Source/portable/Paradigm/Tern_EE
A Source/portable/Paradigm/Tern_EE/large_untested
Skipped 'Source/portable/Paradigm/Tern_EE/large_untested/port.c'
Skipped 'Source/portable/Paradigm/Tern_EE/large_untested/portasm.h'
Skipped 'Source/portable/Paradigm/Tern_EE/large_untested/portmacro.h'
A Source/portable/Paradigm/Tern_EE/small
Skipped 'Source/portable/Paradigm/Tern_EE/small/port.bak'
Skipped 'Source/portable/Paradigm/Tern_EE/small/PORTASM.bak'
Skipped 'Source/portable/Paradigm/Tern_EE/small/port.c'
Skipped 'Source/portable/Paradigm/Tern_EE/small/portasm.h'
Skipped 'Source/portable/Paradigm/Tern_EE/small/portmacro.h'
U Source/portable/BCC/16BitDOS/PC/port.c
U Source/portable/BCC/16BitDOS/PC/prtmacro.h
[...]

------------
## Status of files that were skipped
------------
# svn st Source/portable/Paradigm/Tern_EE/small/
? Source/portable/Paradigm/Tern_EE/small/port.bak
? Source/portable/Paradigm/Tern_EE/small/PORTASM.bak
? Source/portable/Paradigm/Tern_EE/small/port.c
? Source/portable/Paradigm/Tern_EE/small/portasm.h
? Source/portable/Paradigm/Tern_EE/small/portmacro.h
A + Source/portable/Paradigm/Tern_EE/small

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Tue Jan 30 21:46:58 2007

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