Hello, This is an automated email from the git hooks/update script, it was generated because a ref change was pushed to the repository. Updating branch, master, via 1c9f30b9fab998e2d89dd307a90122618d746cb6 (commit) via 8d62835ba18a7fb662c2f3a23b86a16fe1386388 (commit) via 5ed501565ef8caf4fe2043066750ed7564a2c52d (commit) via 723478560179bc541e89627c43b1cea512fab2a1 (commit) from c0a7d9d82d03d9831f53dbb30357ddb9f10e29ec (commit) - Log ----------------------------------------------------------------- commit 1c9f30b9fab998e2d89dd307a90122618d746cb6 Author: Chantry Xavier Date: Fri Jul 13 15:30:37 2007 +0200 libalpm/deps.c : fix for remove044 pactest. Patch from Nagy that makes removedeps use alpm_depcmp. I also renamed removedeps to recursedeps, as it can have a more general usage, and added an include_explicit argument, so we can control if packages explictly installed are added or not. Note: Small changes made by me (Dan) as well- mostly some English grammar correction and a few other cleanups. Signed-off-by: Chantry Xavier Signed-off-by: Dan McGee commit 8d62835ba18a7fb662c2f3a23b86a16fe1386388 Author: Chantry Xavier Date: Fri Jul 13 10:41:40 2007 +0200 Remove conflict message for non-existent files (reworked) Signed-off-by: Chantry Xavier Signed-off-by: Dan McGee commit 5ed501565ef8caf4fe2043066750ed7564a2c52d Author: Chantry Xavier Date: Fri Jul 13 11:06:53 2007 +0200 remove sync022 and sync023 pactest. Currently the replaces flag is only used for forcing the replacement of package (eg because of a renaming) on sysupgrade operation. If the replaces flag should also be used for resolving conflicts, then it should be discussed and specified correctly first. References: http://bugs.archlinux.org/task/7415#comment17207 http://www.archlinux.org/pipermail/pacman-dev/2007-June/008553.html commit which introduced the replace flag : 4fcec8f03ff790bfb23b826eee169bc9c0b00142 Signed-off-by: Chantry Xavier commit 723478560179bc541e89627c43b1cea512fab2a1 Author: Chantry Xavier Date: Thu Jul 12 13:49:23 2007 +0200 libalpm/remove.c : Rsd combination. Currently the d (nodeps) option skips the s (recursive) part, rendering the Rsd combination totally useless. This patch makes a recursive removal still possible using the nodeps option, as Romashka asked there : http://bugs.archlinux.org/task/6057#comment17784 Signed-off-by: Chantry Xavier ----------------------------------------------------------------------- Diffstat: lib/libalpm/conflict.c | 12 +++-- lib/libalpm/deps.c | 104 ++++++++++++++++++++++------------------------ lib/libalpm/deps.h | 2 +- lib/libalpm/remove.c | 32 ++++++++------ pactest/tests/sync022.py | 22 ---------- pactest/tests/sync023.py | 22 ---------- 6 files changed, 76 insertions(+), 118 deletions(-) hooks/update --- Git Source Code Management System hooks/update refs/heads/master \ c0a7d9d82d03d9831f53dbb30357ddb9f10e29ec \ 1c9f30b9fab998e2d89dd307a90122618d746cb6