On Sat, 13 Nov 2010 16:52:02 +0100, Daniel Baumann <[email protected]> wrote: > On 11/11/2010 01:28 AM, Michael Hudson wrote: > >> the patch doesn't apply on 2.0.x, could you please rebase on > >> debian-old-2.0 branch from git? > > > > The patch was intended for HEAD, but applies to debian-old-2.0 cleanly > > as far as I can tell. What happens when you try to apply it? > > not that it matters (since the other commits up to 2.0.6 don't change > that file), but for the records: at the time you send the patch, the > newest commit on debian-old-2.0 was > 60581a622765b82350e0f0ae78d0be31024aadab. > > dan...@debian:/srv/vcs/debian-live/live-build$ patch -Np1 -i > /srv/temporary/download/debootstrap-argument-passing-fixes.diff --dry-run > patching file build/lb_bootstrap_debootstrap > Hunk #1 FAILED at 55. > Hunk #2 FAILED at 124. > Hunk #3 FAILED at 140. > 3 out of 3 hunks FAILED -- saving rejects to file > build/lb_bootstrap_debootstrap.rej > dan...@debian:/srv/vcs/debian-live/live-build$
It works with -p0 :-) Apologies if I missed some convention here (the diff was generated with bzr, not git, so that might explain the difference). Cheers, mwh -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected] Archive: http://lists.debian.org/[email protected]
