2008/5/25 Jan de Groot <[EMAIL PROTECTED]>: > On Sun, 2008-05-25 at 15:06 +0300, Roman Kyrylych wrote: >> [EMAIL PROTECTED] trunk]$ extrapkg >> gtkspell-2.0.13-1-i686.pkg.tar.gz 100% 24KB 24.0KB/s 00:00 >> File integrity okay. >> ===> Uploaded /home/roman/packages/gtkspell-2.0.13-1-i686.pkg.tar.gz >> ===> Commited with "upgpkg: gtkspell 2.0.13-1" message >> D ../repos/extra-i686/gtkspell-2.0.11-enchant.patch >> CG ../repos/extra-i686/PKGBUILD >> >> property 'svnmerge-integrated' set on '../repos/extra-i686' >> >> ~/scm-repos/svn-packages/gtkspell ~/scm-repos/svn-packages/gtkspell/trunk >> svn: Commit failed (details follow): >> svn: Aborting commit: >> '/home/roman/scm-repos/svn-packages/gtkspell/repos/extra-i686/PKGBUILD' >> remains in conflict >> ~/scm-repos/svn-packages/gtkspell/trunk >> ===> Tagged for extra-i686 >> [EMAIL PROTECTED] trunk]$ >> >> As can bee seen from arch-commits - commit to trunk/ was successful, >> but committing to repos/ fails. >> Any ideas why this happens? > > Just copy the PKGBUILD from trunk to repos/extra-i686, then run these > commands: > > svn resolved PKGBUILD > EDITOR=vi svn ci > > This will resolve the conflict and commit the PKGBUILD to the > repository. The package has already been uploaded by devtools, so after > this you're done. > The conflict is probably from changes to the Maintainer tag: anything > that changes near the SVN ID tag will generate these conflicts (I guess > you changed maintainer for this package).
Ah, thank you! -- Roman Kyrylych (Роман Кирилич)
