On Tue, Jan 06, 2009 at 03:29:01PM +0100, Stefan Sperling wrote:
> All I'm seeing from my script (see attachment) is that alpha_at_r1 is
> copied instead of alpha_at_r3, i.e. copying a mixed-revision working
> copy verbatim to a URL does not seem to work.
Sorry, my script had a bug (it created a branch from trunk_at_r1 and
then tried to do so again from the working copy).
Fixed version is attached, the output looks good now,
alpha_at_r2 is included in the branch. It seems to work.
I cannot reproduce your problem, there must be some detail missing...
+ rm -rf recipe
+ mkdir -p recipe
+ mkdir -p recipe/trunk
+ echo alpha
+ > recipe/trunk/alpha
+ echo beta
+ > recipe/trunk/beta
+ mkdir recipe/trunk/gamma
+ echo delta
+ > recipe/trunk/gamma/delta
+ mkdir recipe/trunk/epsilon
+ echo zeta
+ > recipe/trunk/epsilon/zeta
+ svnadmin create /tmp/recipe/repos
+ svn import recipe/trunk file:////tmp/recipe/repos/trunk -m importing project tree
Adding recipe/trunk/gamma
Adding recipe/trunk/gamma/delta
Adding recipe/trunk/alpha
Adding recipe/trunk/epsilon
Adding recipe/trunk/epsilon/zeta
Adding recipe/trunk/beta
Committed revision 1.
+ rm -rf recipe/trunk
+ svn checkout file:////tmp/recipe/repos/trunk recipe/trunk
A recipe/trunk/gamma
A recipe/trunk/gamma/delta
A recipe/trunk/alpha
A recipe/trunk/epsilon
A recipe/trunk/epsilon/zeta
A recipe/trunk/beta
Checked out revision 1.
+ svn checkout file:////tmp/recipe/repos/trunk recipe/trunk2
A recipe/trunk2/gamma
A recipe/trunk2/gamma/delta
A recipe/trunk2/alpha
A recipe/trunk2/epsilon
A recipe/trunk2/epsilon/zeta
A recipe/trunk2/beta
Checked out revision 1.
+ echo alpha, modified
+ > recipe/trunk/alpha
+ echo delta, modified
+ > recipe/trunk/gamma/delta
+ svn commit -m modified alpha and gamma/delta recipe/trunk
Sending recipe/trunk/alpha
Sending recipe/trunk/gamma/delta
Transmitting file data ..
Committed revision 2.
+ svn update recipe/trunk2/alpha
U recipe/trunk2/alpha
Updated to revision 2.
+ cat recipe/trunk2/alpha
alpha, modified
+ svn info recipe/trunk2/alpha
Path: recipe/trunk2/alpha
Name: alpha
URL: file:///tmp/recipe/repos/trunk/alpha
Repository Root: file:///tmp/recipe/repos
Repository UUID: a1323e9c-dbff-11dd-9f52-f3acd7ff33ad
Revision: 2
Node Kind: file
Schedule: normal
Last Changed Author: stsp
Last Changed Rev: 2
Last Changed Date: 2009-01-06 15:38:08 +0100 (Tue, 06 Jan 2009)
Text Last Updated: 2009-01-06 15:38:09 +0100 (Tue, 06 Jan 2009)
Checksum: 83b7bafa90eaac08996a06ea0fc1063b
+ svn copy -m creating branch recipe/trunk2 file:////tmp/recipe/repos/branch
Committed revision 3.
+ svn cat file:////tmp/recipe/repos/branch/alpha
alpha, modified
+ svn log -v file:////tmp/recipe/repos/branch/alpha
------------------------------------------------------------------------
r3 | stsp | 2009-01-06 15:38:10 +0100 (Tue, 06 Jan 2009) | 1 line
Changed paths:
A /branch (from /trunk:1)
R /branch/alpha (from /trunk/alpha:2)
creating branch
------------------------------------------------------------------------
r2 | stsp | 2009-01-06 15:38:08 +0100 (Tue, 06 Jan 2009) | 1 line
Changed paths:
M /trunk/alpha
M /trunk/gamma/delta
modified alpha and gamma/delta
------------------------------------------------------------------------
r1 | stsp | 2009-01-06 15:38:05 +0100 (Tue, 06 Jan 2009) | 1 line
Changed paths:
A /trunk
A /trunk/alpha
A /trunk/beta
A /trunk/epsilon
A /trunk/epsilon/zeta
A /trunk/gamma
A /trunk/gamma/delta
importing project tree
------------------------------------------------------------------------
Stefan
Received on 2009-01-06 15:44:39 CET