[prev in list] [next in list] [prev in thread] [next in thread] 

List:       subversion-users
Subject:    Re: Individual file merge . Merging a newly added file
From:       Daniel Shahaf <d.s () daniel ! shahaf ! name>
Date:       2017-08-02 14:47:38
Message-ID: 1501685258.3249046.1060874240.14E1548D () webmail ! messagingengine ! com
[Download RAW message or body]

Andrew Reedick wrote on Wed, 02 Aug 2017 12:32 +0000:
> Translation:  The newly added newfile.txt is completely unrelated to the previously \
> existing newfile.txt you are merging from.

JP, note that Andrew was assuming here that the status is really
just "A".  If the status is "A +" then Andrew's reply might or might
not apply.

(To the list: it's possible JP did a 'merge -c 122' which created the
file and now is trying 'merge -c 123' to cherry-pick a followup commit
to that file.)


[prev in list] [next in list] [prev in thread] [next in thread]