[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
gEDA-user: Resolving conflicting PCB patches?
- To: geda-user@xxxxxxxx
- Subject: gEDA-user: Resolving conflicting PCB patches?
- From: Bob Paddock <bpaddock@xxxxxxxxxxxx>
- Date: Sat, 26 Feb 2005 10:17:19 -0500
- Delivered-to: archiver@seul.org
- Delivered-to: geda-user-outgoing@seul.org
- Delivered-to: geda-user@seul.org
- Delivery-date: Sat, 26 Feb 2005 10:17:57 -0500
- Organization: The Designer-III Company http://www.designer-iii.com/
- Reply-to: geda-user@xxxxxxxx
- Sender: owner-geda-user@xxxxxxxx
- User-agent: KMail/1.7.2
I was wondering if there was some standard procedure to resolve conflicting
patches?
For example, this from CVS:
Module Name: pcb
Committed By: djdelorie
Date: Wed Feb 23 14:05:20 UTC 2005
Modified Files:
pcb/src: global.h main.c print.c
Log Message:
Allow FAB author name to be set by .Xdefaults
conflicts with installing this patch:
[ 1112332 ] Print Dialog: Better scale scrollbar & pad/via holes option
The later patch knows nothing about the former FabAuthor CVS code and
complains about bad FabAuthor initializers.
Is there some guide lines for which patches make into the official CVS code?