[Digikam-devel] SideBar support in ShowFoto and Image Editor

[Caulier Gilles]

Le Vendredi 19 Août 2005 00:17, Marcel Wiesweg a écrit :
> > > I'm sure there is some place in KDE SVN where one can create branches.
> > > Instead of providing a tarball from a private development branch on
> > > your computer, create a branch in SVN. We're no longer using CVS after
> > > all, copying is cheap in SVN.
> >
> > svn switch seems to forget to switch some files now and then. I've seen
> > it and I've heard others having the same problem.
> >
> > svn merge is a disaster of both copies have changed. When i merged the
> > experimental branch back to trunk I've had conflicts of the whole file,
> > so first you have the original, then the conflict marker and then the new
> > version. Which sucks, because you then need to see in history of the
> > orignal file to see what changed and merge that in the new one.
>
> I think the idea is to merge trunk continually to the branch and do the
> branch->trunk merge only with a "clean" branch in this respect.
> BTW, merging a private tarball-branch is not so much different.
>
> But of course you are free to do whatever you feel best :-)

I will merge my SideBar code on my computer with svn source code until 0.8.0 
release date. after, i will use svn to store code accordinly with the team.

Gilles