Hi folks,

I've got an interesting problem with dgit. Upstream, I've made a change which performed the following operation (in one commit)

* removed a file (underlays/basewiki/style.css) which was a symlink
  (to doc/style.css)
* moved doc/style.css to the path removed in the previous step

If I cherry-pick this commit over to my debian/dgit branch, write a changelog and try "dgit sbuild", it fails:

dgit: cannot represent change: mode or type changed in unsupported way (120000->100644): underlays/basewiki/style.css

I wondered if bundling the two steps into one commit was the problem.
(The commit is ugly as a result: no move detected, and the file lengths look odd). But performing the steps in separate, serial commits provokes the same error.

Am I holding it wrong?


--
⢀⣴⠾⠻⢶⣦⠀
⣾⠁⢠⠒⠀⣿⡁ Jonathan Dowland
⢿⡄⠘⠷⠚⠋⠀ https://jmtd.net
⠈⠳⣄⠀⠀⠀⠀ Please do not CC me, I am subscribed to the list.

Reply via email to