2009/11/16 Bryan Slatner <bryan_at_slatner.com>:
> Thanks for the quick response.
>
>> The tree conflict dialog tells you:
>> "The last merge operation tried to add the file 'reportexpired.aspx',
>> but it was already added locally."
>>
>> Check the log for that file, maybe you've replaced that file earlier?
>
> The file was replaced earlier. At least, I think that's what I'm seeing. In rev 5985 it shows that file and under "copied from path" shows the URL of a branch.
>
> However, I took my branch from rev 5985, so I really don't understand how there could be a tree conflict here.
>
>> Those revision numbers come from the revisions that svn tries to merge.
>> From your description it's not clear from which working copy (trunk or
>> branch) you attempted the 'reintegrate' merge. But since those revision
>> numbers are not what you expect I guess you're trying to reintegrate
>> trunk into the branch - that's wrong. You can only reintegrate the
>> branch into the trunk.
>
> I am definitely reintegrating the branch into the trunk and not the other way around. I double checked that the local copy is trunk and I am giving the URL of the branch in the reintegrate dialog.
>
> I am wondering if there is not something wrong with my database. If SVN is trying to merge revision 6012, then it is making a mistake, because that version does not exist in the repository. The local copy is rev 5985 and the head of the branch is 6011. I'm not sure how rev 6012 could factor into this.
Do you mean r6012 does not exist at all in the repository, or just
that there are no commits to the branch with that revision? Use repo
browser on the root of the repository and show log from there to find
out.
Remember that revisions are repository-wide, so if another commit was
made elsewhere then r6012 may exist. In the branch r6012 will be the
same as r6011, so it is perfectly legal.
>> Resolving tree conflicts is still a very manual operation, there's not
>> much help from svn or TSVN available. I know there's a lot which can
>> (and has to be) improved in that area, but I can do that in TSVN only
>> after the svn lib provides more API's to get the required information.
>
> I understand. Thanks very much for your help and your work.
Simon
--
: ___
: oo // \\ "De Chelonian Mobile"
: (_,\/ \_/ \ TortoiseSVN
: \ \_/_\_/> The coolest Interface to (Sub)Version Control
: /_/ \_\ http://tortoisesvn.net
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2418562
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2009-11-16 16:35:23 CET