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

RE: Tortoise Bug: Rename command

From: Sam Nabialek <sam.nabialek_at_cylon.com>
Date: Fri, 16 Oct 2009 13:46:00 +0100

> I just worked through a rather similar problem which one of my colleagues
> bumped into. We concluded that what happened was something like
> (1) Edit a file, say d0\f.txt.
> (2) Right-click that file and commit it. This produces a mixed-revision
> working copy, with d0 and most of its contents at revision 10, but
> d0\f.txt at revision 11.
> (3) Use TortoiseSVN to rename d0 as d1.
> (4) Right-click the whole working copy and commit.
> This caused tree conflicts and confusion. To avoid any such problems, use
> TortoiseSVN Update (or svn update, the command-line equivalent) on the
> whole working copy immediately before any directory rename or move
> operation.
> I suppose it might help if TortoiseSVN offered a warning for any
> directory-level move or rename of a mixed-revision working copy. I have no
> idea whether that is feasible, though, and it perhaps ought to be a
> Subversion feature rather than just TSVN.

Not sure if this would help you out of this position, but between(3) and (4) should be (3.5) do SVN update. It'll certainly get you out of the out-of-date problem and prevents any mixed-revision issues. Check out the Subversion book. This operation is SOP. I've had no problems in 4 years of using Tortoise sticking to this simple procedure.

CYLON - smart energy control

Cylon Controls Limited, Clonshaugh Business & Technology Park, Clonshaugh, Dublin 17, Ireland. Registered in Ireland No. 110195


To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2009-10-16 14:47:02 CEST

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