[102586] trunk/dports/devel/mercurial/Portfile

[sean at macports.org]

Revision: 102586
          https://trac.macports.org/changeset/102586
Author:   sean at macports.org
Date:     2013-02-04 21:43:57 -0800 (Mon, 04 Feb 2013)
Log Message:
-----------
mercurial: mark the devel as conflicting

Modified Paths:
--------------
    trunk/dports/devel/mercurial/Portfile

Modified: trunk/dports/devel/mercurial/Portfile
===================================================================
--- trunk/dports/devel/mercurial/Portfile	2013-02-05 05:43:53 UTC (rev 102585)
+++ trunk/dports/devel/mercurial/Portfile	2013-02-05 05:43:57 UTC (rev 102586)
@@ -34,11 +34,15 @@
 
 python.default_version 27
 
+conflicts           mercurial-devel
+
 subport mercurial-devel {
     bitbucket.setup     mirror mercurial-crew e71c2ff93167
     name                mercurial-devel
     version             2.5.0.99
 
+    conflicts           mercurial
+
     checksums           rmd160  e76616497368cfa6808a1749d98670bc0dbf48a0 \
                         sha256  b56fac24102d616dea1b606f66131b347016717357af1257b538cb869749b89f
 }
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130204/42051103/attachment.html>