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

Re: Individual file merge . Merging a newly added file

From: Lorenz <lorenznl_at_yahoo.com>
Date: Wed, 02 Aug 2017 12:48:26 +0000

Andrew Reedick wrote:
>> -----Original Message-----
>> From: Lorenz [mailto:lorenznl_at_yahoo.com]
>> Sent: Wednesday, August 2, 2017 1:34 AM
>> To: users_at_subversion.apache.org
>> Subject: Re: Individual file merge . Merging a newly added file
>> JP wrote:
>> >
>>>I am trying to merge a newly added file . I am getting the following
>>>error .
>>>|svn merge -c123 https://my.svn.domain/svn/foo/branches/bar/newfile.txt ./newfile.txt
>>>svn: E200009: Merge target './newfile.txt' does not exist in the working copy
>>>https://my.svn.domain/svn/foo/branches/bar/newfile.txt is in status "A"
>>>. How can I do such merges .
>> adding a file is a change to the parent directory.
>Translation: The newly added newfile.txt is completely unrelated to the previously existing newfile.txt you are merging from.
>a) Remove the newly added newfile.txt and instead do a 'svn copy ...' of the previously existing newfile.txt to the new location. This preserves ancestry and makes merging easier.
>b) If the newly added newfile.txt really should be completely independent/unrelated to the previously existing newfile.txt, then you will need to use a "2-URL merge" to merge the previously existing newfile.txt into the newly added newfile.txt. Refer to "svn help merge".
>From "svn help merge":
> 3. This form is called a '2-URL merge':
>The target branch may be the same as one or both sources, or different again.
> The three branches involved can be completely unrelated.

that's not the OPs scenario (I think)

OP added a file on a branch and then wants to cherry-pick-merge the
addition to trunk (or a different branch).

But you can only merge changes of a file to a already existing target.

That is he needs to merge the addition of the file on the parent
folder level.

Received on 2017-08-02 14:49:13 CEST

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.