[aur-general] AUR4, git, subtrees ELI5?

[Phillip Smith]

On 16 June 2015 at 14:26, Eli Schwartz <eschwartz93 at gmail.com> wrote:
>
> FWIW you can use filter-branch to run mksrcinfo on each folder in your
> current aur-packages repo, then merge in my base branch and continue on as
> before. Might have to resolve a conflict between our .gitignores, (I may be
> biased but I prefer mine :-P ) but other than that it should work fine.

Thanks for your ongoing interest -- I think I've royally screwed it
all though.... Because I've submitted all my packages to AUR4 using
individual (fresh) git repos, now I can't push using `aurpublish`
because there's no common commits.

I tried your 'adopt' option to aurpublish to pull the repo from the
AUR server into my umbrella git repo, but still won't let me push:

 ~/aur-packages $ ./aurpublish stenc
git push using:  aur:/stenc.git master
To aur:/stenc.git
 ! [rejected]        89b88136c6e0b9bf70f0975ebebedd2a05c9f3fa ->
master (non-fast-forward)
error: failed to push some refs to 'aur:/stenc.git'
hint: Updates were rejected because the tip of your current branch is behind
hint: its remote counterpart. Integrate the remote changes (e.g.
hint: 'git pull ...') before pushing again.
hint: See the 'Note about fast-forwards' in 'git push --help' for details.

~/aur-packages $ git subtree pull -P stenc aur:/stenc.git master
>From aur:/stenc
 * branch            master     -> FETCH_HEAD
Already up-to-date.


Thanks for you patience with my cluelessness with this!