On 04/23/2013 12:28:43 PM, Felix Janda wrote:
On 04/22/13 at 06:51pm, Rob Landley wrote:
> I've lost the plot somewhere, neither of these patches apply to my
> current tree. Last two commit to that file I have (from you) are:
>
> changeset: 872:793972c94560
> user: Felix Janda <felix.ja...@posteo.de>
> date: Sat Apr 20 00:18:17 2013 +0200
> files: toys/pending/stat.c
> description:
> stat cleanup
>
>
> changeset: 871:8aa07b575cd6
> user: Felix Janda <felix.ja...@posteo.de>
> date: Fri Apr 19 21:29:36 2013 +0200
> files: toys/pending/stat.c
> description:
> stat: Reindent from 4 to 2 spaces
>
> When I "hg import -f" the attached files it's a bunch of rejected
> hunks. What did I miss?
I don't know. I just freshly hg cloned toybox, ran
hg import format-mode.patch
hg import stat-help.patch
and it seemed to work.
Found it, problem at my end.
Rob
_______________________________________________
Toybox mailing list
Toybox@lists.landley.net
http://lists.landley.net/listinfo.cgi/toybox-landley.net