Merge conflicts

.gitignore

@@ -0,0 +1,3 @@
+*~
+*.mo
+urpm-tools.pot

docs/urpm-repodiff.1

@@ -16,6 +16,8 @@ repositories.
 "New" repository or list of "new" repositories if several present.
 .IP "\fB\-\-quiet, -q\fP"
 Quiet mode: hide service messages.
+.IP "\fB\-\-no-release, -r\fP"
+Ignore release during package compare.
 .PP
 .SH "USUAL OUTPUT OPTIONS"
 .IP "\fB\-\-size, -s\fP"
@@ -33,6 +35,15 @@ If \fB--output, -o\fP option is not present, page will be output to file 'repodi
 .SH "OUTPUT OPTION"
 .IP "\fB\-\-output, -o OUTPUT_FILE\fP"
 Change standart output to OUTPUT_FILE.
+.SH "FILTER OPTION"
+.IP "\fB\-\-show-new, -N\fP"
+Show new packages.
+.IP "\fB\-\-show-removed, -R\fP"
+Show removed packages.
+.IP "\fB\-\-show-updated, -U\fP"
+Show updated packages.
+.IP "\fB\-\-show-downgraded, -D\fP"
+Show downgraded packages.
 .SH "EXAMPLES"
 .IP "Compare packages in two local repositories:"
 \fBurpm-repodiff --old /tmp/repo-old --new /tmp/repo-new\fP

urpm-repomanage.py

@@ -188,7 +188,7 @@ def main(args):
                     for dropped in evrlist[:keepnum]:
                         (e,v,r,d) = dropped
                         pkg = str(verfile[(n,a,e,v,r,d)]).replace("['","").replace("']","")
-                        subprocess.call(["rm", pkg])
+                        subprocess.call(["rm", "-f", pkg])
                 if options.verbose:
                     for dropped in evrlist[:keepnum]:
                         (e,v,r,d) = dropped