[arch-dev-public] [PATCH 3/3] makechrootpkg: fixed copying of packages with splitting

[Aaron Griffin]

On Fri, Sep 18, 2009 at 5:08 PM, Eric Bélanger <snowmaniscool at gmail.com> wrote:
> On Fri, Sep 18, 2009 at 5:57 PM, Aaron Griffin <aaronmgriffin at gmail.com> wrote:
>> On Fri, Sep 18, 2009 at 4:50 PM, Eric Bélanger <snowmaniscool at gmail.com> wrote:
>>> This patch fixed copying of packages with splitting (FS#16181).  It also adds missing quotes around chrootdir variable.
>>
>> Pushed to master. I actually had to do it by hand due to some of the
>> changes in git (and git am being terrible for resolving conflicts)
>> When I did that, I forgot to attribute it to you with the --author... sorry :(
>>
>> http://projects.archlinux.org/?p=devtools.git;a=commitdiff;h=06b02906b89d1af6a2e4c9cb6412c187c9619612
>>
>
> I thought my git tree was up-to-date. I'm following the instructions
> in http://wiki.archlinux.org/index.php/Super_Quick_Git_Guide  but it
> looks like my local files are not being updated to the master branch.
> When I run "git format-patch master" it recreate all the patches I've
> done so far.  Is there an error in the Super_Quick_Git_Guide ?

Well, it uses your local copy of the master, not the remote. I think I
pushed 2 patches between the time you said "I'll make a patch" and the
time I got it.

So here's what I'd do, assuming you're working on a branch called "eric".

git checkout master
git pull
git checkout eric
git rebase master

I do a pull on master before I start working and before I plan to
merge to master, which usually keeps things clean