X-Original-To: alpine-devel@lists.alpinelinux.org Delivered-To: alpine-devel@lists.alpinelinux.org Received: from mail-ww0-f44.google.com (mail-ww0-f44.google.com [74.125.82.44]) by lists.alpinelinux.org (Postfix) with ESMTP id 4BDAA1EB587 for ; Mon, 25 Oct 2010 15:55:19 +0000 (UTC) Received: by wwe15 with SMTP id 15so3662209wwe.25 for ; Mon, 25 Oct 2010 08:55:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:mime-version:sender:reply-to:received :in-reply-to:references:from:date:x-google-sender-auth:message-id :subject:to:cc:content-type; bh=Q1UIsJUMDGCS5CvhY1MR8Nvhs9q4GTXiAK7Ch1wLsoM=; b=riattbbVFfnpKPA0+Dz4A6CfHR1GNaXT7bjnr1ZCLyZWJMlYDxSb7YwMTpTE7mz+O7 J8IizhpjY1QxQAWiLrvAW6EyEbbE9GMEZ5QKpTfJ2j5rWqpJzVgbhKs/4eIj7fW1Ph3N RZwafQ+yI7uVbeN/AeKwfYW/JVbdFdczuPXfQ= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:sender:reply-to:in-reply-to:references:from:date :x-google-sender-auth:message-id:subject:to:cc:content-type; b=ebjD3H8fpIhbxuJnUz5drDZS04FgqKtA+ML6UdzgMnAqbLeU/1iBud2/95bfhyY1ni +80FSAAW6MlplQcwvHYIibmtnidjx+nEPz4N0WONPPj38DZic/9z1nJdwdKjFzFnpj3h zHd107vI1ImBanyuFV1lphsYmHp3ZeADYI0s0= Received: by 10.227.138.147 with SMTP id a19mr6687683wbu.93.1288022118121; Mon, 25 Oct 2010 08:55:18 -0700 (PDT) X-Mailinglist: alpine-devel Precedence: list List-Id: Alpine Development List-Unsubscribe: List-Post: List-Help: List-Subscribe: MIME-Version: 1.0 Sender: jeremythomerson@gmail.com Reply-To: jeremy@thomersonfamily.com Received: by 10.216.230.69 with HTTP; Mon, 25 Oct 2010 08:54:57 -0700 (PDT) In-Reply-To: <1288021636.13130.25.camel@ncopa-desktop.nor.wtbts.net> References: <20101025152532.CEF741C78B@jeremythomerson.com> <1288021636.13130.25.camel@ncopa-desktop.nor.wtbts.net> From: Jeremy Thomerson Date: Mon, 25 Oct 2010 10:54:57 -0500 X-Google-Sender-Auth: lCBHFTQ9FVv93Sj4wMzBjTifDsQ Message-ID: Subject: Re: [alpine-devel] testing/rdiff-backup: new aport To: Natanael Copa Cc: alpine-dev Content-Type: multipart/alternative; boundary=0016363ba20ad044a404937304e0 --0016363ba20ad044a404937304e0 Content-Type: text/plain; charset=ISO-8859-1 Okay - coming momentarily. On Mon, Oct 25, 2010 at 10:47 AM, Natanael Copa wrote: > On Thu, 2010-10-21 at 14:37 +0000, Jeremy Thomerson wrote: > > This is the follow-up to last night's patch to add rdiff-backup. > > > > Is there some way that I should do this to make it appear as one patch? > I wasn't sure of your procedure, > > but since I'd already committed the first (broken) attempt locally, the > second commit to fix it is a second > > patch as well. > > Yes. > > Do change. > git add APBUILD > git commit --amend > > will "redo" last commit. > > Does not work if the changes are pushed to a public repository, since it > will create problems for people who have checked it out. (you rewrite > the history). > > We should update the wiki with this info. Soemthing like: > If patch is rejected on mailing list, do the suggested changes, git > commit --amend and git send-email again. > > > Jeremy > > > > > --0016363ba20ad044a404937304e0 Content-Type: text/html; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable Okay - coming momentarily.

On Mon, Oct 25= , 2010 at 10:47 AM, Natanael Copa <ncopa@alpinelinux.org> wrote:
On Thu, 2010-10-21 at 14:37 +0000, Jeremy= Thomerson wrote:
> This is the follow-up to last night's patch to add rdiff-backup. >
> Is there some way that I should do this to make it appear as one patch= ? =A0I wasn't sure of your procedure,
> but since I'd already committed the first (broken) attempt locally= , the second commit to fix it is a second
> patch as well.

Yes.

Do change.
git add APBUILD
git commit --amend

will "redo" last commit.

Does not work if the changes are pushed to a public repository, since it will create problems for people who have checked it out. (you rewrite
the history).

We should update the wiki with this info. Soemthing like:
If patch is rejected on mailing list, do the suggested changes, git
commit --amend and git send-email again.

> Jeremy
>



--0016363ba20ad044a404937304e0-- --- Unsubscribe: alpine-devel+unsubscribe@lists.alpinelinux.org Help: alpine-devel+help@lists.alpinelinux.org ---