Ben Boeckel
Ben Boeckel
Any update here?
Is the `UpdateFromUpstream.sh` in sync with the [upstream](https://gitlab.kitware.com/utils/git-import-third-party/-/blob/master/update-common.sh) script? I don't know how ITK uses it.
Was this branch rebased at some point? Third party import merge commits cannot just be rebased; I typically remove the commit from the `rebase -i` and replace it with `exec...
Note that the robot does have a check to *enforce* that the merge happens properly and will detect and block any rebases like this. It does not seem the robot...
> Is in that work/upstream where you perform that rebase? The import is not (and should not be) rebased. That is what `git rebase` does not understand. Using `exec` to...
> What commit from the ITK history do you remove and replace with the exec update? What is in `master` is there. I'm talking about when you use `git rebase...
> the logs may be misleading on how many files are actually being touched. A rebase put the imported tree into the main ITK history without an `-Xsubtree` option. The...
FWIW, this has been fixed in #706.
For reference, #2447 discussed the addition of that note to the spec (and it was added in #2449).
Using Windows applications from Cygwin is generally not going to work (due to the differences in the views of filesystem paths generally). Vice versa is just as unlikely too. Cygwin...