[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: Merge rename tracking

From: Folker Schamel <schamel23_at_spinor.com>
Date: 2004-09-06 10:25:30 CEST

> On Mon, Sep 06, 2004 at 01:08:30AM +0200, Folker Schamel wrote:
>>The hurdle is that the svk wc format is not compatible
>>to the svn wc format.
>>For daily work this means that you cannot use TortoiseSVN.
>>Using svk for merging only means that you need an additional working copy
>>in the svk format, which means extra compiling time you have to keep
>>up-to-date only for merging.
> Not quite true, svk supports external merge tool:
> http://wagner.elixus.org/~clkao/svk-intro/slide14a.html
> Which also means you can perform merge in-place, without a working
> copy. So basically there's no overhead if you just want to use svk
> for rename-aware merging, while keep using svn for all the other
> things.

In our case we need a test compile before committing the merge.
This test compile basically always shows up minor bugs
caused by merging but having not shown up by conflicts.
(E.g. utilify function AAA renamed to BBB in branch1,
but a new call to function AAA added in a different file in branch2.)

> But I guess in your case the real hurdle would be svk doesn't work
> fully on win32 yet. It's being worked on and has very nice progress
> at the status of self-hosting..

Is there anywere information about the status of svk on win32?
I cannot find something about it on svk.elixus.org.

>>Just for interest:
>>What's the reason that svk is not part of svn?
>>svk functionality being part of svn would be a dream!!
> Well, I'm just implementing what I need, and it happens to be useful
> for some people too. For now people who want extremely disconnected
> working environment and/or advanced merge features can use svk when
> they need it. Switching back and forth from/to svn is painless.
> Meanwhile I have no problem if people are going to implement what svk
> offers back in svn, and I'm all for help, since it means other people
> will be taking care of something useful to me! But it's going be a
> lot of work, and that's why I didn't do it in C. (I'll stop here
> instead of cursing the wc code :)

To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Mon Sep 6 10:27:52 2004

This is an archived mail posted to the Subversion Dev mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.