[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: Mon, 23 Jun 2008 11:52:34 -0400

"Kari Grano" <kari.grano_at_gmail.com> writes:
> Well spotted! To my excuse I can only say that I was in a hurry and did not
> pay attention to the error message for the URL target. I guess this goes
> to show that users never read error messages :).
>
> Anyway, it turns out that the command is unnecessary for the error output,
> so please just remove it. I've attached a revised script below.

Okay, I've got a .sh reproduction script now. It produces this error:

   subversion/libsvn_wc/log.c:1602: (apr_err=155009)
   svn: In directory 'dir'
   subversion/libsvn_wc/log.c:1602: (apr_err=155009)
   svn: Error processing command 'append' in 'dir'
   subversion/libsvn_wc/log.c:618: (apr_err=155009)
   svn: Missing 'dest' attribute in 'dir'

Here's the script:

------------------------------------------------------------------------
#!/bin/sh

# The next line is the only line you should need to adjust.
SVNDIR=/home/kfogel/src/subversion

SVN=${SVNDIR}/subversion/svn/svn
SVNSERVE=${SVNDIR}/subversion/svnserve/svnserve
SVNADMIN=${SVNDIR}/subversion/svnadmin/svnadmin

URL=file:///`pwd`/repos

rm -rf repos trunk-wc trunk-wc-other b1-wc

${SVNADMIN} create repos

${SVN} mkdir --parents -m "first commit" ${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 1 dir
${SVN} ci -m "changed myprop to 1 in r3"
${SVN} ps myprop 2 dir
${SVN} ci -m "changed myprop to 2 in r4"
cd ..

# Prepare two working copies of trunk.
${SVN} co ${URL}/trunk trunk-wc
${SVN} co ${URL}/trunk trunk-wc-other

# Change the same property (but to a different value) on trunk.
# It doesn't matter which working copy we do this from.
cd trunk-wc
${SVN} ps myprop 3 dir
${SVN} ci -m "changed myprop to 3 in r5"
${SVN} up
cd ..

# Make sure the "other" working copy is equally up-to-date.
cd trunk-wc-other
${SVN} up
cd ..

echo ""
echo "### Now we're going to try two different ways of merging."
echo "###"
echo "### In one trunk working copy, we'll merge all at once:"
echo "###"
echo "### svn merge --accept postpone -r2:4 \\"
echo "### ${URL}/branches/b1"
echo "###"
echo "### But in another trunk working copy, we'll merge in sequence:"
echo "###"
echo "### svn merge --accept postpone -r2:3 \\"
echo "### ${URL}/branches/b1"
echo "### svn merge --accept postpone -r3:4 \\"
echo "### ${URL}/branches/b1"
echo "###"
echo "### Here's the first way (merging all at once):"
echo ""

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

echo ""
echo "###"
echo "### And here's the second way (two sequential merge commands):"
echo "###"
echo ""

cd trunk-wc-other
echo "### (running the first command, r2:3)"
${SVN} merge --accept postpone -r2:3 ${URL}/branches/b1
echo "### (running the second command, r3:4)"
${SVN} merge --accept postpone -r3:4 ${URL}/branches/b1
cd ..

echo ""
echo "###"
echo "### Hmmm. That's not good."
echo "###"
echo ""

---------------------------------------------------------------------
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 17:53:15 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.