[aur-general] CVS freeze and move to SVN/official tools
aaronmgriffin at gmail.com
Fri Jul 17 19:35:22 EDT 2009
Yeah the svn merge can be a little hairy. This most likely arose because I
added Id keywords to all PKGBUILDs, not just those in trunk...
As long as the PKGBUILD in repos/foo matches the package in the foo repo,
you're good. If things ever get crazy, you can probably just svn rm the repo
dir, commit, then re-archrelease
On Jul 17, 2009 6:25 PM, "bardo" <ilbardo at gmail.com> wrote:
2009/7/18 bardo <ilbardo at gmail.com>:
> *** ATTENTION: There was a problem merging the package changes *** > To
fix it, edit the conflicti...
It seems it was lying. No .mine files in the whole tree. I just had a
'svn up' in the root gcc-avr dir (*not* in trunk), checked nothing was
changed, went back into trunk, ran 'svn commit' and finally ran
'archrelease community-x86_64', which yielded a "nothing to commit". I
don't quite grok it, but it seems to be fine. Sorry for the noise.
More information about the aur-general