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

Re: Side effect on merging?

From: durumdara <durumdara_at_gmail.com>
Date: Wed, 13 Jul 2011 03:04:24 -0700 (PDT)


Thanks for all info, I will ask something from you about this theme.

On júl. 12, 10:32, Simon Large <simon.tortoise..._at_gmail.com> wrote:
> On 12 July 2011 08:35, durumdara <durumd..._at_gmail.com> wrote:
> The way to 'merge' is described in the subversion book and is referred
> to as a dump/load cycle. If you recreate the repository you will lose
> all history.

There is no problem.
The goal is:
- Packing the revisions to last version on the svn server
- Find a way to in the client we don't change anything

> > But I don't know what happens with anothers if I do this.
> > 1.) svn make error when it is see that repository is not same - this
> > is better
> If you create a new repository it has a new UUID so the old working
> copies will not be able to access it.
> > 2.) I got mysterious errors, when svn confuses on differences - this
> > is unacceptable
> This can only happen if you force the UUIDs to be the same, or if you
> always create repositories by copying an empty repository instead of
> letting subversion create one.

I tried this. I have a repos with a file what had 4 revisions.

I did this on server:

c:\Repositories>dump _testdump 4

c:\Repositories>"c:\Program Files\VisualSVN Server\bin\svnadmin.exe"
dump -r4 _t
estdump 1>_testdump.dump
* Dumped revision 4.

xxx here I deleted the _testdump repos with VisualSVN GUI xxx

c:\Repositories>create _testdump

c:\Repositories>"c:\Program Files\VisualSVN Server\bin\svnadmin.exe"
create _tes

c:\Repositories>load _testdump _testdump

c:\Repositories>"c:\Program Files\VisualSVN Server\bin\svnadmin.exe"
load --forc
e-uuid _testdump 0<_testdump.dump
<<< Started new transaction, based on original revision 4
     * adding path : trunk ... done.
     * adding path : trunk/testfile.txt ... done.
     * adding path : branches ... done.
     * adding path : tags ... done.

------- Committed new rev 1 (loaded from original rev 4) >>>

Everything is seems to be ok, I forced the uuid.

But when I tried on client side to make an update, servers said:
REPORT of '/svn/_temptdump/!svn/vcc/default' could not read chunk
size: Secure connection truncated.

So I want to ask: is it impossible to clients remaining unchanged with
theirs checkouts after I dump/reload to merge to last revision?



To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2011-07-13 12:04:33 CEST

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

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