ok, the 'test merge' is just a 'test'.
how to explain the 2nd question?
the 'tree conflict' should not occur.
And the same operations success using tsvn below:
1.6.0 32bit
1.4.0 32bit
> On 05.09.2011 12:12, Jia Baozhen 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 result of "test merge" and "merge" are different! Is this is a bug?
> > And, my operations should success; I do not know why it fail (tree
> > conflict... ).
>
> A test merge is just that: a test.
> It doesn't actually execute the merge, and therefore can not detect all
> situations in which a conflict might occur.
> Only the real merge can do that.
>
> The test merge is only to test what you *might* expect from a merge,
> which files are to be merged.
>
> Stefan
>
> --
> ___
> 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=2835726
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2011-09-06 03:49:25 CEST