Benno Schulenberg <[EMAIL PROTECTED]> 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: [EMAIL PROTECTED] 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."
_______________________________________________
bug-parted mailing list
bug-parted@gnu.org
http://lists.gnu.org/mailman/listinfo/bug-parted
