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

AW: [TSVN] TortoiseMerge ignoring my changes

From: Saegesser Lukas <Lukas.Saegesser_at_ud-neuemedien.ch>
Date: 2005-03-22 12:47:21 CET

yes that helped, thanks!
i hope i didn't trade for more serious problems now with the nightly build..

-----Ursprüngliche Nachricht-----
Von: Simon Large [mailto:slarge@slarge.plus.com]
Gesendet: Dienstag, 22. März 2005 10:07
An: dev@tortoisesvn.tigris.org
Betreff: Re: [TSVN] TortoiseMerge ignoring my changes

Saegesser Lukas wrote:
> we have this problem on every single workstation in the office (all
> winXP, win2k) with TortoiseSVN 1.1.3 using the SVN server 1.1.3 or
> 1.1.1 (doesn't matter).
> when we do a "Check for modifications" and some file was modified
> both in the repository and in the working copy, and we double click
> it to open it in TortoiseMerge to view and compare the changes, the
> local changes in the working copy are just not displayed.
>
> the part of the window is clearly labeled "Yours - Working Copy", but
> the changed code is just not there.

It is there when I try it on my machine. Try a nightly build. This
problem (or one like it) was fixed recently.

Simon

-- 
       ___
  oo  // \\      "De Chelonian Mobile"
 (_,\/ \_/ \     TortoiseSVN
   \ \_/_\_/>    The coolest Interface to (Sub)Version Control
   /_/   \_\     http://tortoisesvn.tigris.org
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Tue Mar 22 12:49:09 2005

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.