Re: Problem with merge tracking in 1.5.0

From: Colm Aengus Murphy <colm.murphy_at_s3group.com>
Date: Tue, 08 Jul 2008 16:27:39 +0100

Hi Mark,

Here is a script you can use to reproduce the problem.

Regards

Colm A

#!/bin/csh

set pwd = `pwd`
set REPO = $pwd/repo
set WORK = $pwd/work

mkdir $WORK

echo "Creating repo structure"
svnadmin create $REPO
svn mkdir -m "Created branches" file://$REPO/branches
svn mkdir -m "Created devel branch" file://$REPO/branches/devel
svn mkdir -m "Created devel/tools" file://$REPO/branches/devel/tools

echo "Checkout devel and add file"
cd $WORK
svn checkout file://$REPO/branches/devel/tools tools
echo "This is a file" > tools/file.txt
svn add tools/file.txt
svn commit -m "Initial commit" tools
svn update tools

echo "Create private branch"

# Create a private branch
svn mkdir -m "Created private_1 branch" file://$REPO/branches/private_1
svn copy -m "copied to private_1 branch" file://$REPO/branches/devel/tools file://$REPO/branches/private_1

echo "Switch to private branch and make an change"
svn switch file://$REPO/branches/private_1/tools tools
echo "change made on private_1" >> tools/file.txt
svn commit -m "change made on private_1" tools
svn update tools

echo "Switch to devel branch and make an conflicting change"
svn switch file://$REPO/branches/devel/tools tools
echo "change made on devel" >> tools/file.txt
svn commit -m "change made on devel" tools
svn update tools

echo "Merge to devel"
svn merge --reintegrate --accept postpone file://$REPO/branches/private_1/tools tools

echo "Resolve conflict and commit"
echo "This is a file" > tools/file.txt
echo "resolved changes" >> tools/file.txt
svn resolve --accept working tools/file.txt
svn commit -m "Merged changes from private_1" tools
svn update tools

svn log -g tools

echo "Try to repeat the merge to devel"
svn merge --reintegrate --accept postpone file://$REPO/branches/private_1/tools tools


Mark Phippard wrote:

On Mon, Jul 7, 2008 at 2:41 PM, Mark Phippard <markphip@gmail.com> wrote:
  

On Mon, Jul 7, 2008 at 10:20 AM, Colm Aengus Murphy
<colm.murphy@s3group.com> wrote:

    

I committed all changes (including the change to the dir at the root of the
project). I can see the details of the merge using svn log -g (or using
Tortoise SVN repo browser).
The only difference between the two tests was that in the second test the
merged file had a conflict.
      

Can you create a reproduction recipe?  Ideally a script/batch file
that creates a repository, loads initial content, and then runs the
commands that leads to the problem.
    

It occurs to me that this is actually the expected behavior.  Of
course it is not the ideal or desired behavior, but it is what we
would expect.  I am going to try to put together a blog post that
explains in more detail and will post link when I have it.

You really need to delete and recreate branches after they are
reintegrated for merges to continue to DTRT.

  

-- 
---------------------------------------------------------------------
 Colm Aengus Murphy,                Tel       : +353 1 2911000
 Release Manager,                   Direct Tel: +353 1 2911373
 Consumer Mobile,
 Silicon & Software Systems,        Fax       : +353 1 2911001
 South County Business Park,
 Leopardstown,                      E-mail: colm.murphy@s3group.com
 Dublin 18.                         WWW   : www.s3group.com
 Ireland
---------------------------------------------------------------------

---

The information contained in this e-mail and in any attachments is confidential and is designated solely for the attention of the intended recipient(s). If you are not an intended recipient, you must not use, disclose, copy, distribute or retain this e-mail or any part thereof. If you have received this e-mail in error, please notify the sender by return e-mail and delete all copies of this e-mail from your computer system(s). Please direct any additional queries to: communications@s3group.com. Thank You. Silicon and Software Systems Limited. Registered in Ireland no. 378073. Registered Office: South County Business Park, Leopardstown, Dublin 18

---

--------------------------------------------------------------------- To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org For additional commands, e-mail: users-help@subversion.tigris.org Received on 2008-07-08 17:28:10 CEST