I heard from my coworker.He told me that.He would provide screen shot
when this event occurs again.
My workaround is set it not auto merge use
http://tortoisesvn.tigris.org/faq.html ...
prevent Subversion from doing automatic merges?
thanks for your response.
On 7月28日, 下午3時30分, Simon Large <simon.tortoise..._at_googlemail.com>
wrote:
> On 28 July 2010 08:10, Edwin <edwin..._at_gmail.com> wrote:
>
> > Dears,
> > Recently,we face large merge works in C++ source.Found a strange
> > event about svn udpate auto merge with those files. if code comments
> > end with //===== ,then the merge result would ignore next line which
> > is not commnets.Is that an issue or I can config to avoid ? thanks
>
> Where did you hear that? Is this an issue you can reproduce or just a rumour?
>
> 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&dsMess...
>
> To unsubscribe from this discussion, e-mail: [users-unsubscr..._at_tortoisesvn.tigris.org].
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2639620
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2010-07-28 10:58:57 CEST