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

[Fwd: Re: [script][repost] The merging added files bug]

From: Santeri Hernejärvi <gray_at_gray.mine.nu>
Date: 2003-01-06 22:19:55 CET

Karl Fogel wrote:

>Santeri Hernejärvi <gray@gray.mine.nu> writes:
>
>
>>It only happens when doing a merge over dav with user & pass and
>>I seem to recall a bug with the auth-cache, maybe this has got
>>something to do with it.
>>
>>
>
>I think your mailer is wrapping some of the lines in that script.
>
>And, what version of subversion? (Client and server).
>
>-Karl
>
Oops, fixed (hopefully) now.
Version: svn, version 0.16.0 (dev build) compiled Dec 21 2002, 05:54:05

Trying to build a new subversion now, will report back in a bit.

.s - will check the To: field from now on. ;-) (Sorry Karl)

Script:
#!/bin/sh

REPOS=http://host/svn/repos
USER=user
PASS=pass

svn --username $USER --password $PASS -m "create project" \
mkdir $REPOS/test
svn --username $USER --password $PASS -m "apa" mkdir \
$REPOS/test/trunk
svn --username $USER --password $PASS -m "apa" mkdir \
$REPOS/test/branches

mkdir foo
svn co --username $USER --password $PASS \
$REPOS/test/trunk foo/trunk
cd foo/trunk
echo "file in trunk" > a
svn add a
echo "add a on trunk"
svn ci -m "added a"
svn up --username $USER --password $PASS
cd ..
cd ..

svn --username $USER --password $PASS -m "branched" cp \
$REPOS/test/trunk/ $REPOS/test/branches/foo/
svn --username $USER --password $PASS co \
$REPOS/test/branches/foo/ foo/branch
cd foo/branch
echo "file added on branch" > b
svn add b
echo "add b on branch"
svn ci --username $USER --password $PASS -m "added b on branch"
svn up --username $USER --password $PASS
cd ..
cd ..

# crash?
echo "merge"
svn merge --username $USER --password $PASS \
$REPOS/test/trunk/ $REPOS/test/branches/foo/ foo/trunk

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Mon Jan 6 22:20:52 2003

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