Mauro Carvalho Chehab wrote: > On Thu, 23 Apr 2009 17:05:45 +0200 > Erik Andrén <[email protected]> wrote: > > >> Hi, I'm truly sorry for creating this mess. I wasn't aware of that the >> previously pulled changesets still were registred after a pull. > > No problem. > >> I'm all for submitting pull requests to you Mauro. >> Just to avoid these kind of situations in the future please review this >> process. >> >> 1. Perform various commits to my local v4l-dvb tree >> 2. Pull the main tree >> 3. Resolve any conflicts > > Be care with the conflicts: if you fix non-trivial conflicts at the merge > commit, this will be lost when I'll generate the -git patch (since merge > patches aren't exported). On those cases, the better is to clone main tree, > and > apply patch per patch on it (./hgimport script helps with this), fixing the > conflict on the affected patch. > >> 4. Push my local tree >> 5. Send mail asking for a pull > > Ok. >> Do I need to do anything further or could I just repeat this process >> in the future? > > The above process, noticing my comment is enough. >> Best regards, >> Erik >
Ok, so the next step is to clone your main v4l-dvb tree, apply the new patches and submit a pull request directly to you, or have Jean-Francois already pulled them? Best regards, Erik > > > > Cheers, > Mauro > -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
