Re: "svn up" and problem with blog-stream
Christian Stocker <[email protected]>
| Newsgroups | gmane.comp.cms.bitflux.general |
|---|---|
| Organization | Bitflux GmbH |
| Message-ID | <[email protected]> |
On 9.11.2005 12:23 Uhr, Matthias Dieke wrote: > Hi, > > some weeks ago I had to modify the blog-stream to give the possibility > editing the blog-author. Today I made "svn up" and I get some trouble > with "/inc/bx/streams/blog.php". > > I have four files there: > > - blog.php > - blog.php.mine > - blog.php.r5713 > - blog.php.r5865 look at blog.php, search for >>>>> and <<<< this highlights the differences, which svn couldn't resolve furthermore blog.php.mine is your original version blog.php.r5865 is the new version with diff -u blog.php.mine blog.php.r5865 you can see the difference. Now you can fix blog.php and then do svn resolved blog.php which deletes the .mine and .rXXX files and sets the state to resolved so that a next svn up does work Furthermore, don't forget to call admin/webinc/update/. I added a new field to the blogposts table. without this, you get a sql error :) chregu > > > I'm not such a Linux and/or SVN "freak", how can I get a working version > without loose my changes? > > Thanks > > Matthias -- christian stocker | Bitflux GmbH | schoeneggstrasse 5 | ch-8004 zurich phone +41 1 240 56 70 | mobile +41 76 561 88 60 | fax +41 1 240 56 71 http://www.bitflux.ch | [email protected] | GPG 0x5CE1DECB -- bitflux-cms mailing list [email protected] http://lists.bitflux.ch/cgi-bin/listinfo/bitflux-cms