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

Re: SVN Update menue command not updating changed files

From: Jean-Marc van Leerdam <j.m.van.leerdam_at_gmail.com>
Date: Thu, 16 Apr 2009 21:12:36 +0200

Hi,

2009/4/16 Sajjad Akhter <sajjadakhter_at_gmail.com>:
> Hi,
>
>
>
> I am relatively new to svn and tortoise svn. My current configuration is
> that I have TRAC with SVN repository behind apache.
>
>
>
> It generally working fine but merges are kind of pain. If I have modified a
> file and someone else also modified that file and their changes. Even I run
> svn update it doesn’t merge changes even though there are no change
> conflicts.
>

But do you get an error when you update your working copy, or is the
file always marked as 'conflicted'?

If the update always reports a conflict on the file, then the
svn:mime-type is probably set to something other than text/...
Subversion will only attempt to merge text/... files

-- 
Regards,
Jean-Marc
--
.       ___
.  @@  // \\      "De Chelonian Mobile"
. (_,\/ \_/ \     TortoiseSVN
.   \ \_/_\_/>    The coolest Interface to (Sub)Version Control
.   /_/   \_\     http://tortoisesvn.net
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=1753100
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2009-04-16 21:14:20 CEST

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