Gentoo Archives: gentoo-commits

From: "Zac Medico (zmedico)" <zmedico@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] portage r12121 - main/branches/2.1.6/man
Date: Sat, 29 Nov 2008 06:39:45
Message-Id: E1L6JUV-00041C-Re@stork.gentoo.org
1 Author: zmedico
2 Date: 2008-11-29 06:39:43 +0000 (Sat, 29 Nov 2008)
3 New Revision: 12121
4
5 Modified:
6 main/branches/2.1.6/man/emerge.1
7 Log:
8 Add 'automatically resolved' blockers to the --pretend docs. (trunk r12120)
9
10
11 Modified: main/branches/2.1.6/man/emerge.1
12 ===================================================================
13 --- main/branches/2.1.6/man/emerge.1 2008-11-29 06:37:31 UTC (rev 12120)
14 +++ main/branches/2.1.6/man/emerge.1 2008-11-29 06:39:43 UTC (rev 12121)
15 @@ -402,7 +402,8 @@
16 F fetch restricted (must be manually downloaded)
17 f fetch restricted (already downloaded)
18 I interactive (requires user input)
19 -B blocked by an already installed package
20 +B blocked by another package (unresolved conflict)
21 +b blocked by another package (automatically resolved conflict)
22 .TE
23 .TP
24 .BR "\-\-quiet " (\fB\-q\fR)