On Tuesday 30 January 2007 23:31, B. Smith-Mannschott wrote:
> 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.
Funny huh... that's what I was trying to tell the other person, but I
don't know if they understood :) But I don't know that mine is the
reason their subfolders did not add. I'm just guessing that when they
did a merge, it didn't add the folders there.
> > 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.
So between your words, the book, and the problem... 'merge' as I used
it is not good for merging changes from the vendor into my working
copy (or merging any other branches into the trunk, for that matter).
Of course I'm missing something because that makes no sense.
> > # 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.
I'm trying to merge changes which are committed in vendor/FreeRTOS
into trunk/FreeRTOS. The part not working the way I expect is when
the vendor added new subfolders. The merge copies them to the trunk
in the working copy, but decides not to add them.
The directory "Tern_EE" for example was introduced in the vendor
release (using svn_load_dirs), and I am now trying to merge the
addition into the trunk which of course does not have Tern_EE. Why
should it when the trunk was coppied from the older vendor release?
I'm still trying to understand the book section you mentioned, but
maybe I'm supposed to always use "--ignore-ancestry". If that makes
it add the files that should be added, then what's the use without
the switch? The book examples are just too simple to address this.
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Thu Feb 1 16:14:28 2007