better way to handle patches
tzafrir.cohen at xorcom.com
Mon May 15 20:01:49 UTC 2006
On Mon, May 15, 2006 at 04:47:50PM -0300, Caio Begotti wrote:
> On Monday 15 May 2006 16:41, Tzafrir Cohen wrote:
> > So that patch uses rather non-standard pathes.
> It's only a few pt-* audio messages in the same dir where the rest of the
> standard audio files lies. I don't know whether it's "wrong" or what.
> > (OT: grab trunk and test it there. It's rather different.)
> I just did it and Celso Fassoni is working on the diff, as far I was told.
> Anyway, this patch works in the official release 1.7.1 and just need some
> tweak to build fine together Debian patches. We (from AsteriskBrasil) hope it
> will get commited by upstream soon, so it's a problem for the author to get
> it built with Digium's trunk.
> Becoming ontopic again: what do you guys use to handle new patches and how do
> you solve conflicts with Debian patches and new .diff's?
I don't expect any conflicting patches. Are there?
If patches start conflicting we're probably over-patching and this is a
good time to do a sanity check to see if any of the two could be
dropped. If none: maybe try to merge. Or reshape the patches so they
won't conflict (sometimes you can move the patching line a bit).
Tzafrir Cohen sip:tzafrir at local.xorcom.com
icq#16849755 iax:tzafrir at local.xorcom.com
tzafrir.cohen at xorcom.com http://www.xorcom.com
More information about the Pkg-voip-maintainers