Re: Merge not recognizing conflicts?

I don't know that it's necessarily a Subversion issue; it seems to be related to Tortoise in that Tortoise occasionally doesn't recognize all of the conflicted files. When this occurs, the Tortoise merge results window shows some files as being updated, but in reality they're conflicted- Subversion sees the .working, .r1 and .r2 files. It's not something that I can recreate regularly, unfortunately, as it's only happened a few times.

Thanks,

-Bryan

-----Original Message-----
From: Stefan Küng [mailto:tortoisesvn@gmail.com]
Sent: Wednesday, March 21, 2007 1:36 PM
To: users@tortoisesvn.tigris.org
Subject: Re: Merge not recognizing conflicts?

Choate, Bryan (IHG) wrote:
> When running a merge from, say, the trunk to a branch, I've seen this
> behavior a couple of times and so have others on my team. Basically I
> resolve all the conflicts that Tortoise shows me in the merge list, and
> then close and try to commit. Low and behold, there are other files
> still in a conflicted state that the merge results didn't recognize.
> We're using 1.4.2... any thoughts on why this is happening?

If you can reproduce this, then please report this on the Subversion
mailing list.

Stefan

-- 
        ___
   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest Interface to (Sub)Version Control
    /_/   \_\     http://tortoisesvn.net
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: users-help@tortoisesvn.tigris.org
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: users-help@tortoisesvn.tigris.org