Cool, I was wondering how to locally merge branches. I have an ATSC card I'm trying to get going that needs a month old update that hasn't been merged with anything yet last check: http://linuxtv.org/hg/~stoth/cx23885-video ----- Original Message ----- From: "Manu Abraham" <abraham.manu@xxxxxxxxx> To: "VDR Mailing List" <vdr@xxxxxxxxxxx> Sent: Saturday, April 12, 2008 6:42 AM Subject: Re: VDR and "multiproto" - which driver to use? > Klaus Schmidinger wrote: > > I'm in the process of reintroducing the "multiproto" changes > > in order to start the 1.7 developer version. > > > > Since I haven't been following the driver development recently > > I was wondering if somebody could tell me which driver is best > > to use at this time. > > > > The one at > > > > http://jusst.de/hg/multiproto > > > > is like 4 weeks old, while at > > Had been away on a vacation, plus some work, hence no recent changes. > > > > > http://linuxtv.org/hg/~endriss/v4l-dvb-av7110-full-ts-mod > > > > there have been recent activities. > > I'd like to switch to a driver that works with "multiproto" and > > supports Oliver's full ts mod. > > It shouldn't be hard to use the 2 repositories together, it can be used > quite straight forward like this: > > $ hg clone http://jusst.de/hg/multiproto > > $ cd multiproto > > $ hg pull -u http://linuxtv.org/hg/~endriss/v4l-dvb-av7110-full-ts-mod > > After the pull is complete, it will ask you to merge the heads: > > $ hg merge > > commit the merge > > $ hg commit > > You have both the functionality of both trees in one tree. > If that looks hard, i can push a tree which is a result of the above > outlined steps. > > Regards, > Manu > > > _______________________________________________ > vdr mailing list > vdr@xxxxxxxxxxx > http://www.linuxtv.org/cgi-bin/mailman/listinfo/vdr _______________________________________________ vdr mailing list vdr@xxxxxxxxxxx http://www.linuxtv.org/cgi-bin/mailman/listinfo/vdr
