bug-parted
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: [PATCH] Handle options independent of their order.


From: Otavio Salvador
Subject: Re: [PATCH] Handle options independent of their order.
Date: Wed, 18 Apr 2007 19:56:42 -0300
User-agent: Gnus/5.110006 (No Gnus v0.6) Emacs/22.0.95 (gnu/linux)

Benno Schulenberg <address@hidden> writes:

> Otavio Salvador wrote:
>> > Benno Schulenberg wrote:
>> >> Abort on any invalid option, and handle -v and -h first.
>>
>> The idea is OK but can um rediff it and resend? It doesn't apply
>> against master anymore.
>
> Hmm...  I am lost in this git world.
>
> $ git pull
> Fetching refs/heads/debian/master from 
> http://git.debian.org/git/parted/parted.git using http
> Fetching refs/heads/master from 
> http://git.debian.org/git/parted/parted.git using http
> Fetching refs/heads/stable-1.8.x from 
> http://git.debian.org/git/parted/parted.git using http
> Already up-to-date.
>
> $ git checkout master
> Switched to branch "master"
>
> $ patch -p1 <~/parted-better-options.patch --dry-run
> patching file parted/parted.c
>
> It applies fine here.  Where am I going wrong?

Yes, it applies but I need to do 3way merge. No problem, was my fault.

Please check the Debarshi tip and if possible try to produce another
patch to refactory it later. :-)

-- 
        O T A V I O    S A L V A D O R
---------------------------------------------
 E-mail: address@hidden      UIN: 5906116
 GNU/Linux User: 239058     GPG ID: 49A5F855
 Home Page: http://otavio.ossystems.com.br
---------------------------------------------
"Microsoft sells you Windows ... Linux gives
 you the whole house."




reply via email to

[Prev in Thread] Current Thread [Next in Thread]