NetBSD Problem Report #30599
From hannken@eis.cs.tu-bs.de Sat Jun 25 16:42:34 2005
Return-Path: <hannken@eis.cs.tu-bs.de>
Received: from bseis.eis.cs.tu-bs.de (bseis.eis.cs.tu-bs.de [134.169.33.1])
by narn.netbsd.org (Postfix) with ESMTP id 7AB0163B116
for <gnats-bugs@gnats.netbsd.org>; Sat, 25 Jun 2005 16:42:32 +0000 (UTC)
Message-Id: <200506251642.j5PGgQkE001848@watcher.eis.cs.tu-bs.de>
Date: Sat, 25 Jun 2005 18:42:26 +0200 (MEST)
From: Juergen Hannken-Illjes <hannken@eis.cs.tu-bs.de>
Reply-To: hannken@eis.cs.tu-bs.de
To: gnats-bugs@netbsd.org
Subject: xdm.man contains a conflict
X-Send-Pr-Version: 3.95
>Number: 30599
>Category: xsrc
>Synopsis: xdm.man contains a conflict
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: xsrc-manager
>State: closed
>Class: doc-bug
>Submitter-Id: net
>Arrival-Date: Sat Jun 25 16:43:00 +0000 2005
>Closed-Date: Sat Jun 25 17:45:02 +0000 2005
>Last-Modified: Tue Jul 05 22:24:01 +0000 2005
>Originator: Juergen Hannken-Illjes
>Release: NetBSD 3.0_BETA
>Organization:
>Environment:
>Description:
xfree/xc/programs/xdm/xdm.man contains two conflicts. Look for
<<<<<<< xdm.man
...
>>>>>>> 1.1.1.8
Should go to NetBSD 3.0 too.
>How-To-Repeat:
>Fix:
>Release-Note:
>Audit-Trail:
From: Matthias Scheler <tron@netbsd.org>
To: gnats-bugs@netbsd.org
Cc:
Subject: PR/30599 CVS commit: xsrc/xfree/xc/programs/xdm
Date: Sat, 25 Jun 2005 17:42:14 +0000 (UTC)
Module Name: xsrc
Committed By: tron
Date: Sat Jun 25 17:42:14 UTC 2005
Modified Files:
xsrc/xfree/xc/programs/xdm: xdm.man
Log Message:
Resolve conflicts from XFree86 4.5.0 import. This fixes PR xsrc/30599 by
Juergen Hannken-Illjes.
To generate a diff of this commit:
cvs rdiff -r1.6 -r1.7 xsrc/xfree/xc/programs/xdm/xdm.man
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
State-Changed-From-To: open->closed
State-Changed-By: tron@netbsd.org
State-Changed-When: Sat, 25 Jun 2005 17:45:02 +0000
State-Changed-Why:
Fixed. Thanks for the bug report.
From: Jeff Rizzo <riz@netbsd.org>
To: gnats-bugs@netbsd.org
Cc:
Subject: PR/30599 CVS commit: [netbsd-3] xsrc/xfree/xc/programs/xdm
Date: Tue, 5 Jul 2005 22:23:30 +0000 (UTC)
Module Name: xsrc
Committed By: riz
Date: Tue Jul 5 22:23:30 UTC 2005
Modified Files:
xsrc/xfree/xc/programs/xdm [netbsd-3]: xdm.man
Log Message:
Pull up revision 1.7 (requested by tron in ticket #495):
Resolve conflicts from XFree86 4.5.0 import. This fixes PR xsrc/30599 by
Juergen Hannken-Illjes.
To generate a diff of this commit:
cvs rdiff -r1.5.2.1 -r1.5.2.2 xsrc/xfree/xc/programs/xdm/xdm.man
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
>Unformatted:
(Contact us)
$NetBSD: query-full-pr,v 1.51 2026/08/10 02:28:17 riastradh Exp $
$NetBSD: gnats_config.sh,v 1.10 2026/05/13 22:00:09 riastradh Exp $
Copyright © 1994-2026
The NetBSD Foundation, Inc. ALL RIGHTS RESERVED.