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

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

From: Karl Fogel <kfogel_at_newton.ch.collab.net>
Date: 2003-01-06 20:47:58 CET

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

> Script:
> #!/bin/sh
>
> REPOS=http://host:8080/svn/repos
> USER=user
> PASS=secret
>
> svn --username $USER --password $PASS -m "create project" mkdir $REPOS/test
> svn --username $USER --password $PASS -m "create trunk" mkdir
> $REPOS/test/trunk
> svn --username $USER --password $PASS -m "create branch" 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

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Mon Jan 6 21:32:40 2003

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