Re: is this is a bug? test merge success, while merge failed

On Mon, Sep 5, 2011 at 8:12 PM, Jia Baozhen <jiabaozhen_at_gmail.com> wrote:

> my svn server: 1.4.6
> my tsvn: 1.6.16 32bit
> my os: win7
>
> and my operations are:
> 1) create /p/trunk/
> 2) add /p/trunk/trunk.xml
> 3) commit
> 4) create branch /p/branches/01
> 5) add /p/branches/01/branch.xml
> 6) commit
> 7) add /p/trunk/trunk copy.xml
> 8) commit
> 9) merge trunk to branch 01, and commit branch 01, all success!
> 10) merge branch 01 to trunk using "merge 2 different trees", and the
> from is /p/trunk/@head, the to is /p/branches/01_at_head; everything is
> ok if I click "test merge", but fail if click "merge".
>

The tree conflict occurs because this merge is attempting to add
'/p/trunk/trunk.xml', which already exists.

I think, from the order of operations, that you need to do a 'reintegrate
merge', rather than 'merge 2 different trees'.

Regards,
Daniel B.

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

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2011-09-06 04:15:39 CEST