On Thu, Oct 29, 2009 at 2:00 PM, Stefan Küng <tortoisesvn_at_gmail.com> wrote:
> On 29.10.2009 16:02, Robert Dailey wrote:
> > On Thu, Oct 29, 2009 at 3:21 AM, Lübbe Onken
> > <luebbe.tortoisesvn_at_googlemail.com
> > <mailto:luebbe.tortoisesvn_at_googlemail.com>> wrote:
> > Am 28.10.2009 20:21, schrieb Robert Dailey:
> > > I'm doing a complex merge from revision 1797 to about 1980 or
> > so... it's
> > > a lot of changes.
> > From Napoleon to Ronald Reagan. A lot happened in these 183 years.
> > should integrate more often :)
> > Hah, cute.
> > However, this still doesn't explain why TortoiseSVN is still breaking.
> > When that tree conflict comes in, it says a file was trying to be added
> > that was already added. However, regardless of which button I press to
> > resolve the tree conflict (i.e. keep local or keep repository) it does
> > not change that file. Upon inspection of the file, it is the same one
> > that I had added myself. I have to manually browse to the trunk and
> > copy/paste over that file to get the changes merged over.
> Subversion 1.6.0 did resolve such conflicts properly. But then in (I
> think) 1.6.2 that was removed due to some problems and now the API call
> simply marks the conflict as resolved.
Wow that's annoying. Are you aware of any plans on this specific issue?
Seeing as how we're on 1.6.6, it has taken them a while to fix this
properly. What do they intend to do?
To unsubscribe from this discussion, e-mail: [dev-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2009-10-29 20:48:52 CET