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

Re: issue 3486 should be reopened?

From: Daniel Shahaf <d.s_at_daniel.shahaf.name>
Date: Sat, 13 Nov 2010 17:07:28 +0200

Daniel Shahaf wrote on Sat, Nov 13, 2010 at 14:35:13 +0200:
> Attached the non-windows version of your script I used for testing.

#!/bin/sh -ex

rm -rf repo wc

$svnadmin create repo
$svn co file://$REPO_PATH wc
pushd wc

mkdir -p Server/trunk/dir
echo x >> Server/trunk/dir/foo.c
echo x >> Server/trunk/dir/bar.c
$svn add Server
$svn commit -m "1"

$svn move Server Source
$svn commit -m "2"

mkdir -p Source/branches
$svn add Source/branches
$svn commit -m "3"

$svn copy Source/trunk Source/branches/3.0
$svn commit -m "4"

$svn delete Source/trunk/dir/foo.c
$svn commit -m "5"

# few checkins
echo xxx >> Source/branches/3.0/dir/foo.c
$svn commit -m "6"

echo xxx >> Source/branches/3.0/dir/bar.c
$svn commit -m "7"

# merge down bar.c only
pushd Source/trunk
# wtf - 6:7 is exclusive on the left side? -r 7 or -r 7:7 does nothing
$svn merge "^"/Source/branches/3.0 -r 6:7
$svn up
$svn commit -m "8"

echo xxx >> Source/branches/3.0/dir/foo.c
$svn commit -m "9"

pushd Source/trunk
test -n "$1" && $svn up
$svn merge "^"/Source/branches/3.0 -r5:9

Received on 2010-11-13 16:10:41 CET

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.