Age | Commit message (Collapse) | Author | Files | Lines | |
---|---|---|---|---|---|
2011-06-27 | Ensure a file can be replaced by a directory | Dan McGee | 1 | -0/+21 | |
This addresses FS#24904. In a normal upgrade case, this replacement seems to work just fine. However, when doing a sync "replace" type upgrade, we weren't properly handling this edge case due to path comparison not ignoring trailing slashes. Fix this by pruning any trailing slashes past a certain point of file conflict resolution where we no longer need them, which allows us to safely detect cases such as now tested in the new pactest. Signed-off-by: Dan McGee <dan@archlinux.org> |