Maniphest T1022

arc patch fails to properly apply a patch which changes a symlink to a real file
Open, NormalPublic
Actions

Assigned To

Authored By

	epriestley
	Mar 20 2012, 2:23 AM

Tags

Referenced Files

None

Subscribers

View All 15 Subscribers

Tokens

"Like" token, awarded by Pawka."Love" token, awarded by naphat."Like" token, awarded by alexmv."Like" token, awarded by kylec."Like" token, awarded by dgoldstein.

Description

Example: D1939

See PHI1999, where another install reports encountering this.

Related Objects
Search...

		Status	Assigned	Task
		Open	None	T12664 Update diff/patch parsing to extract more metadata and parse a wider range of formats
		Open	epriestley	T1022 arc patch fails to properly apply a patch which changes a symlink to a real file

Event Timeline

epriestley triaged this task as Low priority.Mar 20 2012, 2:23 AM

epriestley added a project: Arcanist.

epriestley added a subscriber: epriestley.

http://tools.tenxer-corp.com/D1609 has a similar example from the wild.

Had a user actually hit this.

epriestley claimed this task.Aug 19 2014, 10:50 PM

I have half a patch for this but it's crazily complicated because of how symlink changes are represented (multiple patch sections, with multiple representations).

joshuaspence added a subscriber: joshuaspence.Jan 23 2015, 11:14 AM

T7884 has the similar case of changing a real file to a symlink.

epriestley merged a task: T9929: arc diff/export generate wrong GIT patch when file is deleted and then create a same name symbol link file..Dec 8 2015, 10:11 AM

epriestley changed the visibility from "All Users" to "Public (No Login Required)".

epriestley added a subscriber: • BrytonLee.

epriestley moved this task from Backlog to arc patch on the Arcanist board.Dec 10 2015, 3:03 PM

defuzz added a subscriber: defuzz.Dec 16 2015, 6:51 PM

Temporary workaround to get a change like this into a client:

'download raw diff' from a Differential page
patch -p1 --forward < ~/D123456.diff.txt

nickz added a subscriber: nickz.Dec 16 2015, 10:53 PM

michaelf added a subscriber: michaelf.Dec 17 2015, 8:27 PM

epriestley merged a task: T10894: Arc patch fails when a symlink is replaced with a file.Apr 28 2016, 5:43 PM

epriestley added a subscriber: prashantv.

Herald added a subscriber: eadler. · View Herald TranscriptApr 28 2016, 5:43 PM

kylec added a subscriber: kylec.May 6 2016, 12:17 AM

dgoldstein awarded a token.May 6 2016, 12:31 AM

dgoldstein added a subscriber: dgoldstein.

kylec awarded a token.Sep 12 2016, 11:43 PM

alexmv awarded a token.Oct 14 2016, 8:18 PM

alexmv added a subscriber: alexmv.

jboning added a subscriber: jboning.Oct 14 2016, 8:44 PM

• naphat awarded a token.Dec 6 2016, 2:40 AM

epriestley added a parent task: T12664: Update diff/patch parsing to extract more metadata and parse a wider range of formats.May 2 2017, 5:00 PM

epriestley mentioned this in T12664: Update diff/patch parsing to extract more metadata and parse a wider range of formats.May 2 2017, 5:12 PM

mikenicholson added a subscriber: mikenicholson.Jun 26 2018, 6:31 PM

epriestley mentioned this in T13165: Copy detection in Git is very eager about empty files.Jul 16 2018, 11:22 PM

alexmv removed a subscriber: alexmv.Mar 31 2019, 10:16 PM

Pawka awarded a token.Oct 24 2019, 5:48 AM

Herald added a subscriber: amckinley. · View Herald TranscriptOct 24 2019, 5:48 AM

epriestley updated the task description. (Show Details)Feb 16 2021, 7:11 PM