[aur-general] CVS freeze and move to SVN/official tools

[bardo]

2009/7/17 Aaron Griffin <aaronmgriffin at gmail.com>:
> Adding Id tags to svn now

I got pwned by this one. My svn-fu is very weak, so I'm a bit stuck. I
was updating a package right when you did this, so here's what I did
(sorry for the Italian text, I hope it's self-explanatory):

[bardo at forty-two trunk]$ svn commit
Trasmetto      trunk/ChangeLog
Trasmetto      trunk/PKGBUILD
Trasmissione dati ..svn: Commit fallito (seguono dettagli):
svn: File '/gcc-avr/trunk/PKGBUILD' is out of date
svn: Il tuo messaggio di log è stato salvato in un file temporaneo:
svn:    '/home/bardo/tu/svn-packages/gcc-avr/svn-commit.tmp'
[bardo at forty-two trunk]$ svn up
GU   PKGBUILD
Aggiornato alla revisione 82.
[bardo at forty-two trunk]$ svn commit -F ../svn-commit.tmp
Trasmetto      trunk/ChangeLog
Trasmetto      trunk/PKGBUILD
Trasmissione dati ..
Commit della Revisione 83 eseguito.
[bardo at forty-two trunk]$ archrelease community-x86_64
property 'svnmerge-integrated' deleted from '../repos/community-x86_64'.

--- Merging r82 through r83 into '../repos/community-x86_64':
UU   ../repos/community-x86_64/PKGBUILD
U    ../repos/community-x86_64/ChangeLog

property 'svnmerge-integrated' set on '../repos/community-x86_64'

~/tu/svn-packages/gcc-avr ~/tu/svn-packages/gcc-avr/trunk
Trasmetto      gcc-avr/repos/community-x86_64
Trasmetto      gcc-avr/repos/community-x86_64/ChangeLog
Trasmetto      gcc-avr/repos/community-x86_64/PKGBUILD
Trasmissione dati ..svn: Commit fallito (seguono dettagli):
svn: Directory '/gcc-avr/repos/community-x86_64' is out of date
*** ATTENTION: There was a problem merging the package changes ***
To fix it, edit the conflicting files in repos/community-x86_64 (the
ones that are C in svn status).
Once you have resolved conflicts, execute 'svn resolved <path to
file>' to tell svn the error was resolved.
Then to finish the merge commit, execute 'svn commit -F
trunk/svnmerge-commit-message.txt' and, if there are no problems,
delete trunk/svnmerge-commit-message.txt
[bardo at forty-two trunk]$ ls
ChangeLog  PKGBUILD  gcc-avr-4.4.0-2-x86_64.pkg.tar.gz
svnmerge-commit-message.txt
[bardo at forty-two trunk]$

And here's where I got stuck... how do I check svn statuses and conflicts?