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

Re: Strange merge behaviour with rc9

From: Karl Fogel <kfogel_at_red-bean.com>
Date: Sun, 22 Jun 2008 18:52:05 -0400

"Kari Grano" <kari.grano_at_gmail.com> writes:
> On Thu, 19 Jun 2008 09:12:22 +0100 Julian Foad wrote:
>> Thanks for the report.
>> It will help very much if you can show us a transcript, meaning copy
>> and paste the actual commands and the output that Subversion prints.
> Hi Julian,
> Thanks for replying. I do have an actual case where the error manifests
> itself. Unfortunately, the repository is not public, and I tried to
> generalize the issue in my previous mail. Since then, I've managed to
> narrow the problem down: it seems that Subversion has problems with repeated
> merging of conflicting properties.
> I've attached a script that reproduces the problem on Windows platform.
> Notes: 1) you need to replace the repository creation command with 'svnadmin
> create'; I don't have that tool installed since I'm using the Collabnet
> client SVN distribution. 2) Save the script as .bat file instead of .txt.
> When run, the script fails with
> svn: In directory 'dir'
> svn: Error processing command 'append'
> svn: Missing 'dest' attribute in 'dir'

I've been trying to translate your reproduction recipe to Bourne Shell
script, so I can run it on my Debian box. But this line is a problem:

   svn ps myprop 1 file:///c:/temp/repo/trunk/dir -m "created myprop"

The propset (ps) command doesn't take a URL target! And I'm running
latest trunk Subversion :-).

Here's the script I have so far; search for "### WTF? ###" for the
problem line.


# The next line is the only line you should need to adjust.



rm -rf repos trunk-wc b1-wc

${SVNADMIN} create repos

${SVN} mkdir --parents -m "first commit" ${URL}/trunk/dir

### WTF? ###
${SVN} ps -m 'created myprop' myprop 1 ${URL}/trunk/dir

${SVN} cp -m "created b1" --parents ${URL}/trunk ${URL}/branches/b1

# Change the property on the branch a couple of times.
${SVN} co ${URL}/branches/b1 b1-wc
cd b1-wc
${SVN} ps myprop 2 dir
${SVN} ci -m "changed myprop to 2"
${SVN} ps myprop 3 dir
${SVN} ci -m "changed myprop to 3"
cd ..

# Change the same property (but to a different value) on trunk.
${SVN} co ${URL}/trunk trunk-wc
cd trunk-wc
${SVN} ps myprop 4 dir
${SVN} ci -m "changed myprop to 4"
cd ..

echo ""
echo "### This would work in trunk-wc:"
echo "###"
echo "### ${SVN} merge --accept postpone -r2:4 ${URL}/branches/b1"
echo "###"
echo "### But watch how running these two in sequence does not work:"
echo "###"
echo "### ${SVN} merge --accept postpone -r2:3 ${URL}/branches/b1"
echo "### ${SVN} merge --accept postpone -r3:4 ${URL}/branches/b1"
echo "###"
echo "### Here goes:"
echo ""

cd trunk-wc
${SVN} merge --accept postpone -r2:3 ${URL}/branches/b1
${SVN} merge --accept postpone -r3:4 ${URL}/branches/b1
cd ..

To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: dev-help_at_subversion.tigris.org
Received on 2008-06-23 00:52:27 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.