[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

TSVN auto merge question?

From: Edwin <edwintai_at_gmail.com>
Date: Tue, 16 Aug 2011 23:01:20 -0700 (PDT)

Dear sir,
    we faced a problem when cowork with a file using tsvn automerge.
our process
1.a file source rev1. author A
2.author B update get source rev1
2.author C update get source rev1
3.author B remove some lines and commit rev2
4.author C modify rev1 add some line and commit got out of date error
5.author C update working copy
--merge and commit success
6.final file inclue author B remove lines.(which is unexpect)

my question is auto merge is base on repository's revison or base on
working copy's svn-base?
how to prevent those removes lines turn back?
thank you

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

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2011-08-17 08:01:28 CEST

This is an archived mail posted to the TortoiseSVN Users mailing list.