subversion-users mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Daniel Shahaf <...@daniel.shahaf.name>
Subject Re: Individual file merge . Merging a newly added file
Date Wed, 02 Aug 2017 14:47:38 GMT
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.)

Mime
View raw message