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

Re: Status "missing, tree conflict"

From: Dominik Psenner <dpsenner_at_gmail.com>
Date: Tue, 30 Aug 2011 20:32:28 +0200

> This suggests that somewhere it still thinks the file is called the old name (Tippet, not Tippett). How do I correct this?

By renaming the file back ("Tippet" => "Tippett") and then do:

$ svn move Tippett Tippet

SVN then correctly knows that you renamed the file and a subsequent:

$ svn commit

should work without bailing.

-- 
Dominik Psenner
## OpenPGP Key Signature #################################
# Key ID: B469318C                                       #
# Fingerprint: 558641995F7EC2D251354C3A49C7E3D1B469318C  #
##########################################################
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2832725
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].

Received on 2011-08-30 20:32:35 CEST

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