RE: Subversion issue when merging between two projects[SEC=UNCLASSIFIED]

> What I did:
> 1. Created a projects with the following structure. Project1 and
> Project2 have been branched from the trunk
>
> Project
> * Trunk
> * Tags
> * Branches
> o Project1
> o Project2
>
> 2. Changed an existing file in Project 1 to add the line "test" at the bottom.
> 3. Committed the change to Project1
> 4. Merged Project 1 with Project 2 with the 'Merge a range of revisions'
> function selecting 'all revisions'
> 5. Committed the merge
> 6. Edit the same file in Project 2 to remove the line 'test'
> 7. Commit the change to Project 2
> 8. Merge Project 2 with Project 1 with the Merge a range of revisions function
> selecting 'all revisions'
>
> What I expect:
> File in Project 1 should have the line 'test' removed.
>
> What actually happened:
> Line 'test' remains in Project 1 even though it should be removed in the last
> revision when Project 2 merges to Project 1.
>
> I suspect that Project2 is determining that since it has two commits, one adding
> a line and the other removing it, that there's no total delta to be applied to
> Project 1

I expect this is an issue with cyclic merges. Since the file for both projects has a common ancestor the merge basically does a diff of changes since the last merge. What version are you using? I think 1.8 was supposed to add support to make these types of merges work more often. I wonder if on the last merge you use --ignore-ancestry it would apply the removal of test.

You probably want to ask a question like this on the svn list. Mark Phippard is the merge guru and perhaps can explain exactly what is happening. You can also check his blog entry http://blogs.collab.net/subversion/subversion-merg which I think expalains cyclic merges which is what I think you are doing here.

BOb

------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=3061020

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2013-07-22 16:48:46 CEST