24615 – package.mask is full of merge conflicts

Bug 24615 - package.mask is full of merge conflicts

Summary: package.mask is full of merge conflicts

Status:	RESOLVED FIXED

Alias:	None

Product:	Portage Development
Classification:	Unclassified
Component:	Unclassified (show other bugs)
Hardware:	All Linux

Importance:	High blocker (vote)
Assignee:	Gentoo Linux bug wranglers

URL:
Whiteboard:
Keywords:

Depends on:
Blocks:

Reported:	2003-07-16 14:28 UTC by Phil Richards
Modified:	2011-10-30 22:21 UTC (History)
CC List:	0 users

See Also:
Package list:
Runtime testing required:	---

Attachments
Add an attachment (proposed patch, testcase, etc.)

Note You need to log in before you can comment on or make changes to this bug.

Description Phil Richards 2003-07-16 14:28:06 UTC

Just did a sync and got loads of errors about masked packages.
Looked in package.mask and found (for example) the following fragment.  Somebody
has done a merge, got a conflict, not fixed it, and commited it.

Naughty.

phil

<<<<<<< package.mask
# <raker@gentoo.org> (25 Sep 2002)
# version bump.  ssl and other fixes
=net-mail/courier-imap-1.5.3
# added choosable maildir/mbox support
=net-mail/uw-imap-2001a-r3
<<<<<<< package.mask
# new ipv6 patch.  squashes ssl patch though.
=sys-apps/ucspi-tcp-0.88-r4
=======
>>>>>>> 1.1966

Comment 1 SpanKY gentoo-dev

2003-07-16 15:09:08 UTC

i dont think carpaski caused this ...

Comment 2 SpanKY gentoo-dev

2003-07-16 20:05:44 UTC

fixed in cvs