On May 1, 2007, at 10:28, hans henderson wrote:
> Scenario:
>
> Branch A is my relatively static "core", gets re-used for multiple
> projects, usually via export rather than checkout. However, for the
> process being discussed here, I could go either way; for now, lets say
> I check it out to wcA.
>
> So I make my changes in the wcA tree - FYI if it helps, not
> deleting/renaming or moving any directories or files, just adding
> (using svn add of course) and modifying them.
>
> OK, everything's working fine with my customisations, now I want to
> upload *just my changes* to a new empty branch. The ultimate goal
> being to be able to export branch A and then checkout only my modified
> files right over the top of the whole tree, these files to be under
> version control and not all the rest, using svn status -q to screen
> out the files I'm ignoring.
>
> An analogy from my old DOS days - from the top of a tree, "attrib -m
> /s". Do your work, then when you want to copy out only the files that
> are new or modified, "xcopy /aa /s" to a new tree. Am I dating myself
> or what? <g>
>
> Here's what I tried:
>
> Copied Branch A to Branch B directly via URLs in the repos, checked
> out from there, made all my changes and committed back up to B.
>
> Created a new empty Branch C, checked that "nothingness" out to wcC,
> and then did an "svn merge A B wcC". My logic was that the merge would
> take my A->B changeset and create a new tree with just the changes in
> wcC. But no, all I got was screens full of error messages about
> skipping all the directories, skipping "missing target" for each file,
> at the end got only one file that was new in the root.
>
> This seems very strange to me, as if the merge command isn't able to
> create new files and folders in the working copy? Do I need an empty
> directory tree in wcC first?
>
> Obviously I'm most interested in how to accomplish my objective, but
> I'd also like to know what I'm not understanding about the merge
> command, even if that's not part of the solution.
>
> Thanks in advance for your help.
My best advice to you is: that's not really how Subversion works.
Read the book at http://svnbook.org to understand how Subversion does
work.
--
To reply to the mailing list, please use your mailer's Reply To All
function
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Tue May 1 21:27:07 2007