Index: bugzilla.dtd
===================================================================
RCS file: /cvsroot/mozilla/webtools/bugzilla/bugzilla.dtd,v
retrieving revision 1.15
diff -u -r1.15 bugzilla.dtd
--- bugzilla.dtd
+++ bugzilla.dtd
@@ -5,7 +5,7 @@
 	maintainer CDATA #REQUIRED
 	exporter CDATA #IMPLIED
 >
-<!ELEMENT bug (bug_id, (alias?, creation_ts, short_desc, delta_ts, reporter_accessible, cclist_accessible, classification_id, classification, product, component, version, rep_platform, op_sys, bug_status, resolution?, dup_id?, bug_file_loc?, status_whiteboard?, keywords*, priority, bug_severity, target_milestone?, dependson*, blocked*, votes?, everconfirmed, reporter, assigned_to, qa_contact?, cc*, (estimated_time, remaining_time, actual_time, deadline)?, group*, flag*, long_desc*, attachment*)?)>
+<!ELEMENT bug (bug_id, (alias?, creation_ts, short_desc, delta_ts, reporter_accessible, cclist_accessible, classification_id, classification, product, component, version, rep_platform, op_sys, bug_status, resolution?, dup_id?, bug_file_loc?, status_whiteboard?, keywords*, priority, bug_severity, target_milestone?, dupes*, dependson*, blocked*, votes?, everconfirmed, reporter, assigned_to, qa_contact?, cc*, (estimated_time, remaining_time, actual_time, deadline)?, group*, flag*, long_desc*, attachment*)?)>
 <!ATTLIST bug
 	error (NotFound | NotPermitted | InvalidBugId) #IMPLIED
 >
@@ -37,6 +37,7 @@
 <!ELEMENT bug_file_loc (#PCDATA)>
 <!ELEMENT short_desc (#PCDATA)>
 <!ELEMENT keywords (#PCDATA)>
+<!ELEMENT dupes (#PCDATA)>
 <!ELEMENT dependson (#PCDATA)>
 <!ELEMENT blocked (#PCDATA)>
 <!ELEMENT votes (#PCDATA)>
Index: Bugzilla/Bug.pm
===================================================================
RCS file: /cvsroot/mozilla/webtools/bugzilla/Bugzilla/Bug.pm,v
retrieving revision 1.193
diff -u -r1.193 Bugzilla/Bug.pm
--- Bugzilla/Bug.pm
+++ Bugzilla/Bug.pm
@@ -1176,6 +1176,7 @@
            bug_status resolution dup_id
            bug_file_loc status_whiteboard keywords
            priority bug_severity target_milestone
+           dupes
            dependson blocked votes everconfirmed
            reporter assigned_to cc),
     
@@ -1527,6 +1528,20 @@
     return $self->{classification};
 }
 
+sub dupes {
+    my ($self) = @_;
+    return $self->{'dupes'} if exists $self->{'dupes'};
+    return [] if $self->{'error'};
+    my $dbh = Bugzilla->dbh;
+    $self->{'dupes'} =
+      $dbh->selectcol_arrayref(q{SELECT dupe
+                                 FROM duplicates
+                                 WHERE dupe_of = ?},
+                               undef,
+                               $self->{'bug_id'});
+    return $self->{'dupes'};
+}
+
 sub dependson {
     my ($self) = @_;
     return $self->{'dependson'} if exists $self->{'dependson'};
@@ -2174,7 +2189,7 @@
     return sort(@fields);
 }
 
-# XXX - When Bug::update() will be implemented, we should make this routine
+# XXX - Bug::update() was implemented, we should make this routine
 #       a private method.
 sub EmitDependList {
     my ($myfield, $targetfield, $bug_id) = (@_);
Index: template/en/default/bug/edit.html.tmpl
===================================================================
RCS file: /cvsroot/mozilla/webtools/bugzilla/template/en/default/bug/edit.html.tmpl,v
retrieving revision 1.103
diff -u -r1.103 template/en/default/bug/edit.html.tmpl
--- template/en/default/bug/edit.html.tmpl
+++ template/en/default/bug/edit.html.tmpl
@@ -223,6 +223,14 @@
               [% END %]
             [% END %]
 
+            [%# *** Duplicates *** %]
+            <tr>
+              [% PROCESS dependencies
+                         dep = { title => "Duplicate reports",
+                                 fieldname => "dupes",
+                                 generated => 1 } %]
+            </tr>
+
             [%# *** Dependencies *** %]
 
             <tr>
@@ -778,28 +786,35 @@
 [% END %]
 
 [%############################################################################%]
-[%# Block for dependencies                                                   #%]
+[%# Block for bug lists                                                      #%]
 [%############################################################################%]
 
 [% BLOCK dependencies %]
   <th align="right">
-    <label for="[% dep.fieldname %]"[% " accesskey=\"$accesskey\"" IF accesskey %]>
-    [% dep.title %]</label>:
+    [% IF !dep.generated %]
+      <label for="[% dep.fieldname %]"[% " accesskey=\"$accesskey\"" IF accesskey %]>
+        [% dep.title %]
+      </label>:
+    [% ELSE %]
+      [% dep.title %]
+    [% END %]
   </th>
   <td>
   [% FOREACH depbug = bug.${dep.fieldname} %]
     [% depbug FILTER bug_link(depbug) FILTER none %][% " " %]
   [% END %]
   </td>
-  <td>
-    [% IF bug.check_can_change_field(dep.fieldname, 0, 1) %]
-      <input name="[% dep.fieldname %]" id="[% dep.fieldname %]"
-             value="[% bug.${dep.fieldname}.join(', ') %]">
-    [% ELSE %]
-      <input type="hidden" id="[% dep.fieldname %]" name="[% dep.fieldname %]"
-             value="[% bug.${dep.fieldname}.join(', ') %]">
-    [% END %]
-  </td>
+  [% IF !dep.generated %]
+    <td>
+      [% IF bug.check_can_change_field(dep.fieldname, 0, 1) %]
+        <input name="[% dep.fieldname %]" id="[% dep.fieldname %]"
+               value="[% bug.${dep.fieldname}.join(', ') %]">
+      [% ELSE %]
+        <input type="hidden" id="[% dep.fieldname %]" name="[% dep.fieldname %]"
+               value="[% bug.${dep.fieldname}.join(', ') %]">
+      [% END %]
+    </td>
+  [% END %]
   [% accesskey = undef %]
 [% END %]