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

Re: svk behaviour

From: John Peacock <jpeacock_at_rowman.com>
Date: 2004-02-19 15:30:03 CET

Burgess, Glenn wrote:
> Right. I understand that as far as svn is concerned it's just an svn
> repository with some meta-data in. But what happens if you work locally for a
> while just using svn commands and then try to resync your local repository
> with the mirror using svk?

That is not how it is intended to operate. The mirror itself is intended to be
read-only and the local changes are stored elsewhere (i.e. not in the mirrored
directories). It should be OK to use the svk mirror as a readonly copy of the
master site, but it should not be changed locally.

> Does it matter to svk that you haven't been using svk commands to commit,
> delete etc, or is it designed in such a way that it 'just works'?

I think you are misunderstanding how svk is intended to be used.

The Master repository is a conventional svn repository and the Slave is a
combination of a mirror of the Master as well as local changes. The mirror is
only synced from the Master, and then the updates merged into the local area.
You must use svk to make local changes.

There is no reason to guess, however. Set up a conventional SVN repository and
then mirror it using svk. Make local changes (using svk) and then send the
update to the master server. Follow the tutorial "Merge local changes to
remote" here:


> For example, I imagine if I merge my local copy with the master it might
> combine all of my off-line commits into one, losing an large part of my
> history.

 From what the tutorial is implying about 'smerge -l', I think that the merge
with the remote will be atomic, i.e. all local changes will be combined into a
single merge (though you can grab all of the local log entries to post to the
remote site). This may or may not be what you want.



John Peacock
Director of Information Research and Technology
Rowman & Littlefield Publishing Group
4501 Forbes Boulevard
Suite H
Lanham, MD  20706
301-459-3366 x.5010
fax 301-429-5748
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Thu Feb 19 15:30:01 2004

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

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