Hi Kalle!
> Stefan Reichör <stefan@xsteve.at> writes:
>> Can you write down the way you keep the patches in SVK?
>
> In my SVK depot "y2005.svn", I have /y2005.svn/mirror/collabnet/
> mirrored from the main Subversion repository, branches and all.
> Then, I have e.g. a /y2005.svn/my/psvn-custom/ branch that I
> originally copied from /y2005.svn/mirror/collabnet/trunk/.
> In this branch, all user options of psvn are customizable.
> Now, when people commit to the trunk, I run svk smerge to apply
> all the new changes to the psvn-custom branch. SVK keeps track
> of which revision of trunk has already been merged to the branch,
> so it won't try to apply the same changes again. When the branch
> becomes synchronized with the trunk, I take a diff between the
> trunk and the branch, examine it, and commit it to the trunk;
> after this, I delete the branch with a comment saying which
> revision of the trunk it was equivalent to.
>
> SVK is able to merge semi-automatically from the branch to the
> trunk too, so I wouldn't really need a separate diff. I don't
> currently use this feature, because I don't want to add svk:merge
> properties to the trunk if they would point to a branch that I
> soon delete anyway. I suppose I could edit the property before
> committing, though.
>
> SVK also has some features for managing patches separately from
> branches, but I had already created the branches before I noticed
> that, and I'm not going to switch now.
>
> In retrospect, I should have branched just the psvn directory,
> rather than the whole trunk. Then I wouldn't have had so many
> changes to merge to the branch. Also, I should perhaps have used
> the same depot for SVN and SVK sources.
Thanks for your explanations.
>> Would it make sense to provide some support in psvn.el for SVK?
>
> I think so. The command set of psvn would fit SVK just fine.
> SVK has extra commands too but those can be added later.
>
> In fact, I've been meaning to ask whether anybody would object
> if I added SVK support to psvn.el in the Subversion repository.
> Currently, I'm somewhat afraid to commit to psvn.el because I'm
> not really using SVN working copies in which I'd notice any bugs
> I may cause.
When you add the features step by step, I think that you can keep the
bug rate low.
> I am thinking M-x svn-status would automatically detect whether
> the working copy is from SVN or SVK (with the SVN check first,
> as it's faster), and set a buffer-local variable that the other
> functions would then read.
I definitely like that approach and it sounds as that detection is the
crucial function. So when that function works, the functions for the
correct backend will be used.
I heartly welcome patches to add support for SVK.
Stefan.
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Fri Sep 30 23:35:39 2005