What are the revisions in which you created the files on the branch
that aren't showing up in the merge? If you created them between 4379
and 4549, they should be showing up in the merge, just like every
other change made in that range.
On May 21, 2008, at 18:30, Ian Dees wrote:
> Which revisions do I need to merge then? r4379 is the revision that
> made the branch.
>
>
> On Wed, May 21, 2008 at 6:16 PM, marc gonzalez-carnicer wrote:
>
>> you probably did not merge the proper revisions. double check the
>> revision numbers.
>>
>> you may also want to use svnmerge.py.
>>
>>
>> 2008/5/21 yellowbkpk:
>>
>> > I made a dev branch (e.g. "dev-branch") off of trunk a couple
>> weeks ago. I
>> > attempted to merge them today using the Subversion Book process:
>> >
>> > $ cd work/trunk
>> >
>> > $ svn up
>> > At revision 4549.
>> >
>> > $ svn merge -r4379:4549 http://svn.x.com/project/branches/dev-
>> branch
>> > ...
>> >
>> > This works, but there are several files that I created on the
>> branch that
>> > don't show up in my working copy. They are reported as "Skipped
>> missing
>> > target: 'x/y/z'"
>> >
>> > How can I get these files merged? I am pretty sure they aren't
>> renamed, but
>> > are in fact brand new files from the branch that need to be
>> added to the
>> > trunk.
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: users-help_at_subversion.tigris.org
Received on 2008-05-23 14:09:38 CEST