Steps to repro (I did so in 1.8.8, 1.8.12 and 1.9.7): - user 1 and user 2 have checked out the same repo and their working copy is on trunk. - user 1 creates foo.txt with contents "a" and commits - user 2 creates foo.txt with contents "b" and updates - no warning is issued to user 2 and foo.txt on working copy of user 2 contains "b"
I think it should either show an option on what to do, or a warning or at least leave foo.txt in a conflicted state containing something like "< a > b" (or whatever the diff syntax is). Doing these steps via the svn console tool results in the much better: > local file unversioned, incoming file add upon update > Select: (r) mark resolved, (p) postpone, (q) quit resolution, (h) help: -- You received this message because you are subscribed to the Google Groups "TortoiseSVN" group. To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. To view this discussion on the web visit https://groups.google.com/d/msgid/tortoisesvn/e4698b36-e1f4-45d9-bcaf-a99eb63307f6%40googlegroups.com. For more options, visit https://groups.google.com/d/optout.
