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

Languages/Tortoise.pot conflicted on update

From: Russell Hind <rh_gmane_at_mac.com>
Date: 2005-10-28 09:16:56 CEST

Just done a manual update and build to get the nightlies going again and
noticed that Tortoise.pot got marked as conflicted. I have reverted it,
but I guess this is the problem of having a file that gets modified
during builds versioned.



To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Fri Oct 28 09:24:10 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.