Bug 203055

Summary:

Moved or new file contents not included in diff via arc(8)

Product:

Services

Reporter:

Jean-Sébastien Pédron <dumbbell>

Component:

Code Review

Assignee:

Phabric Admin <phabric-admin>

Status:

Closed FIXED

Severity:

Affects Many People

CC:

brnrd, dim, koobs, kwm, smh

Priority:

Normal

Keywords:

dogfood, needs-qa, regression

Version:

unspecified

Hardware:

Any

OS:

Any

URL:

https://reviews.freebsd.org/D3234

Attachments:

Description	Flags
Fix the arcanist binary_safe_diff script to preserve diff's exit code	none

Description Jean-Sébastien Pédron freebsd_committer

2015-09-12 10:08:47 UTC

Copnsider the following review:
https://reviews.freebsd.org/D3234

In diff #6, a patch was copied from lang/rust/files to lang/rust-nightly/files in my Subversion working copy (using svn cp). The file is listed in the review's ToC. However, the raw diff, downloaded from the upper right corner, does not contain this new file.

Comment 1 Eitan Adler freebsd_committer

2015-10-21 04:25:13 UTC

Is this still an issue?  How was the diff created (manually uploaded? 'arc diff')

Comment 2 Jean-Sébastien Pédron freebsd_committer

2015-10-21 07:11:40 UTC

Hi Eitan!

I don't know if this is still a problem as I didn't uploaded a new diff with a moved file recently.

The diff was created with "arc diff".

Comment 3 Bernard Spil freebsd_committer

2015-10-21 14:47:26 UTC

Just hit this issue as well. https://reviews.freebsd.org/D3953

The raw diff when applied using `patch` the files are emptied in mariadb- and the new mariadb53- directories are not created. After renaming the mariadb- folders to mariadb53 and applying the patch it works as expected.

Next to that, the creation of files for the mariadb101- ports shows "Hunk succeeded" yet no file/directory is created.

Can the patches only be applied to svn repos using `svn patch`?

Thanks!

Bernard.

Comment 4 Jean-Sébastien Pédron freebsd_committer

2015-11-02 10:24:25 UTC

This happens for new files too, not only moves/renames. See:
https://reviews.freebsd.org/D4058

Comment 5 Jean-Sébastien Pédron freebsd_committer

2015-11-02 10:25:20 UTC

*** Bug 204206 has been marked as a duplicate of this bug. ***

Comment 6 Steven Hartland freebsd_committer

2015-12-12 03:33:44 UTC

Yer have filed a bug with phabricator here:
https://secure.phabricator.com/T9970

Comment 7 Steven Hartland freebsd_committer

2015-12-12 03:35:24 UTC

Have tried with arc port: php5-arcanist-20150626_2 and from phabricators git version hash: dae2f0073f019221839924b4b1431c6cba5dcddaESC

Comment 8 Dimitry Andric freebsd_committer

2015-12-12 20:45:04 UTC

See my proposed fix here: https://secure.phabricator.com/D14755

Comment 9 Dimitry Andric freebsd_committer

2015-12-12 21:03:22 UTC

Created attachment 164158 [details]
Fix the arcanist binary_safe_diff script to preserve diff's exit code

Comment 10 Dimitry Andric freebsd_committer

2015-12-13 11:14:56 UTC

Fixed upstream by:
https://secure.phabricator.com/rARC97056a3b85bbee72d6ede1b9478b03dee1db2d4e
and:
https://secure.phabricator.com/rARC7d25fcdbdb51f28a1e6465edd819aa5d99bc0f71

Comment 11 Jean-Sébastien Pédron freebsd_committer

2016-02-13 14:54:38 UTC

I can't reproduce this problem anymore, so an update to our Phabricator must have fixed this.

Thank you!