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

Multipass merge creates conflict markers that TortoiseSVN can't parse

From: JJ <eggsgloriouseggs_at_gmail.com>
Date: Tue, 7 Oct 2008 11:32:43 -0500

Hi,

When doing a multipass merge and postponing conflict resolution, the merge
can create files with conflict markers for each pass of the merge.
TortoiseMerge does not parse these markers properly. Is this behavior
expected? Cut and paste the following to reproduce the situation using the
command line client. Then try to edit the conflict in TortoiseSVN.

Thanks,
JJ

echo "--- Cleaning up repo and wc"
rmdir /s/q repo wc

echo "--- Creating repo"
svnadmin create repo
set REPO=file:///C:/temp/repo
set WC=C:\temp\wc

echo "--- Checking out WC"
svn co %REPO% %WC%

echo "--- Create initial structure"
svn up %WC%
mkdir %WC%\trunk %WC%\branches %WC%\tags
svn add %WC%\*
svn ci -m "Initial dir structure" %WC%

echo "--- Add file to trunk"
svn up %WC%
echo "hello world" > %WC%\trunk\file.txt
svn add %WC%\trunk\file.txt
svn ci -m "Add file.txt to trunk" %WC%

echo "--- Create branch A"
svn up %WC%
svn cp %WC%\trunk %WC%\branches\A
svn ci -m "Create branch A" %WC%

echo "--- Edit file.txt on branch A"
svn up %WC%
echo "goodbye world" > %WC%\branches\A\file.txt
svn ci -m "Edit file.txt on branch A" %WC%

echo "--- Create branch B"
svn up %WC%
svn cp %WC%\branches\A %WC%\branches\B
svn ci -m "Create branch B" %WC%

echo "--- Edit file.txt on branch B"
svn up %WC%
echo "goodbye again world" > %WC%\branches\B\file.txt
svn ci -m "Edit file.txt on branch B" %WC%

echo "--- Edit file.txt on trunk"
svn up %WC%
echo "hi world" > %WC%\trunk\file.txt
svn ci -m "Edit file.txt on trunk" %WC%

echo "--- Merge from branch B to trunk"
svn up %WC%
svn merge --accept postpone %REPO%/branches/B %WC%\trunk
Received on 2008-10-07 18:32:51 CEST

This is an archived mail posted to the TortoiseSVN Users mailing list.