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

Re: assertion during merge in 1.6.1

From: Paul Burba <ptburba_at_gmail.com>
Date: Mon, 20 Apr 2009 09:54:14 -0400

On Sun, Apr 19, 2009 at 11:28 AM, Stefan Küng <tortoisesvn_at_gmail.com> wrote:
>
> Yes, the assertion is triggered on Windows.
> Here's my script (converted your bash script) for Windows:
>
> [[[
> set SVNADMIN=svnadmin
> SVN=svn
>
> cd d:\Development\SVN\SVNTests
>
> rd /s /q repo
> rd /s /q wc
>
> SVNADMIN create repo
> SVN co file:///d:/Development/SVN/SVNTests/repo wc
> cd wc
> SVN mkdir tags trunk trunk/project trunk/project/program branches
> echo > trunk/project/program/prg1.c
> SVN add trunk/project/program/prg1.c
> SVN ci . -m "test"
> cd ..
> rd /s /q wc
> SVN co file:///d:/Development/SVN/SVNTests/repo wc
> SVN cp wc/trunk wc/tags/1.0
> SVN ci wc/tags -m "tag"
> SVN cp wc/trunk wc/branches/b1.0
> SVN ci wc/branches -m "branch"
> SVN up wc
> echo "new line" > wc/branches/b1.0/project/program/prg1.c
> SVN ci wc/branches/b1.0 -m "mlkjmlkj"
> SVN merge --reintegrate file:///d:/Development/SVN/SVNTests/repo wc/trunk/
> ]]]

A windows reproduction script, what a refreshing change :-) Looking
at this now.

Paul

------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=1825183
Received on 2009-04-20 15:54:33 CEST

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.