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

Re: merge "Skipped" many subfolders

From: B. Smith-Mannschott <benpsm_at_gmail.com>
Date: 2007-01-31 07:19:44 CET

(* What follows is a guess. I can't really tell without knowing more
about the state of your working copy before the merge and its
relation to the merge source. *)

On Jan 30, 2007, at 21:46, Jeff Smith wrote:

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

That's not surprising if their situation is like yours below. If you
blow away a working copy containing uncommitted changes and
unregistered files, you can't expect them to magically reappear when
you check out again.

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

To me it looks like the things that were skipped had were not under
svn control in the working copy you were trying to apply the merge
to. I suspect svn skips these by design.

> ------------
> svn merge -r 45:48 svn://localhost/robo/vendor/FreeRTOS
> ------------
>

[...snip...]

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

It could help to study "Copying Changes Between Branches" in Chapter
4 of the SVN Book again. In fact, I think I'll go do that myself.

<http://svnbook.red-bean.com/nightly/en/
svn.branchmerge.copychanges.html#svn.branchmerge.copychanges.bestprac.tr
ack>

// ben

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Wed Jan 31 07:20:10 2007

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