subversion-users mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Andrew Reedick <jreed...@incomm.com>
Subject RE: Individual file merge . Merging a newly added file
Date Wed, 02 Aug 2017 12:32:10 GMT


> -----Original Message-----
> From: Lorenz [mailto:lorenznl@yahoo.com] 
> Sent: Wednesday, August 2, 2017 1:34 AM
> To: users@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://na01.safelinks.protection.outlook.com/?url=https%3A%2F%2Fmy.sv
> >|n.domain%2Fsvn%2Ffoo%2Fbranches%2Fbar%2Fnewfile.txt&data=02%7C01%7Cjre
> >|edick%40incomm.com%7Cbf08bacf2e7f48e9062108d4d9683be1%7Cd08e5403b1c94d
> >|bfaf91bab966a84dea%7C1%7C0%7C636372489093013309&sdata=%2BS0P8L4moTaajr
> >|L5XQS%2BIc4ln8hyEci1GdDKhYkh1eE%3D&reserved=0 ./newfile.txt
> >svn: E200009: Merge target './newfile.txt' does not exist in the 
> >working copy
> >
> >https://na01.safelinks.protection.outlook.com/?url=https%3A%2F%2Fmy.svn.domain%2Fsvn%2Ffoo%2Fbranches%2Fbar%2Fnewfile.txt&data=02%7C01%7Cjreedick%40incomm.com%7Cbf08bacf2e7f48e9062108d4d9683be1%7Cd08e5403b1c94dbfaf91bab966a84dea%7C1%7C0%7C636372489093013309&sdata=%2BS0P8L4moTaajrL5XQS%2BIc4ln8hyEci1GdDKhYkh1eE%3D&reserved=0
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.

Either 
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.
Or
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.



Mime
View raw message