Hi,
I tried to merge a branch into the trunk, but I did not (yet) want to
merge two directories which were under the top level. The top level had
files and a directory added in the branch. Having read up on the "new"
-depth option, which I hadn't used before, I tried to do the following:
# check out trunk, cd into it
# svn merge --depth immediates ^/branches/some_branch .
# svn merge --depth infinity ^/branches/some_branch/som_dir some_dir
I did the latter for each of the half dozen or so dirs. The first
command added the files in the top level, the latter command merged the
subdirs, except that it did not add any files from the branch into these
immediate subdirs. (Files were added further down the dirs.)
Trying to reproduce the problem with the examples from the book I
realized that I think I should have used --set-depth instead of --depth,
but this option does not exist in svn merge. Wouldn't that be something
for the wish-list? Or have I done something wrong?
What's the best solution for this sort of merge? I have created a sparse
checkout, with the directories which I didn't want to merge missing, so
checking out with --depth immediate, then populating some dirs using the
--set-depth infinity. Merging the top level then merges the immediates,
merging the sub dirs again updates the existing files but does not add
the one which were added on the branch.
The only solution I have found is to actually svn copy the files which
have been added in the top level dir on the branch. That sounds so
un-cool.
Is there any other way???
Gunther
Gunther Clasen - Verification Specialist
________________________________
EnSilica Limited
The Barn, Waterloo Road
Wokingham
Berkshire
RG40 3BY
Tel: +44 (0)1183 217 316
Fax: +44 (0)1189 798 160
Web: http://www.ensilica.com <http://www.ensilica.com/>
Email: gunther.clasen_at_ensilica.com
<mailto:gunther.clasen_at_ensilica.com>
EnSilica Ltd is a company registered in England and Wales with company
number 04220106 and VAT registration number 776136704. Confidentiality
Notice: The information contained in this e-mail, and any attachments,
is intended for the named recipients only. It may contain confidential
and/or legally privileged information. If you are not the intended
recipient, you must not copy, store, distribute or take any action in
reliance on it. Any views expressed do not necessarily reflect the views
of the company. If you receive this e-mail by mistake, please advise the
sender by using the reply facility in your e-mail software and then
delete it.
Received on 2010-07-20 15:19:14 CEST