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

Re: No Changes but flagged as modified?

From: Jon Hardcastle <jd_hardcastle_at_yahoo.com>
Date: Tue, 3 Jun 2008 07:58:52 -0700 (PDT)

--- On Tue, 3/6/08, Dave Lawrence <dlawrence_at_ad-holdings.co.uk> wrote:

> From: Dave Lawrence <dlawrence_at_ad-holdings.co.uk>
> Subject: Re: No Changes but flagged as modified?
> To: users_at_tortoisesvn.tigris.org
> Date: Tuesday, 3 June, 2008, 12:58 PM
> > The files were definitely identical - as simon pointed
> out. I checked the md5. I also turned off all the options
> to 'ignore x y z' in Tortoise.
> >
> > The version I am running is:
> >
> > TortoiseSVN 1.4.5, Build 10425 - 32 Bit , 2007/08/26
> 11:14:13
> >
> > Unfortunately necessity has meant I have had to commit
> the 'changes' so i don't have them any more in
> their so called differing state.. but i do note that it has
> added them as 'replacing' another file?
> >
> > Thanks
> >
> "Replaced" means the item was deleted, and then
> another item (which
> could be identical) has been added at the same path. This
> could happen
> in a single revision by doing something like
>
> 1) TSVN->delete foo.c
> 2) Somehow reinstate the file foo.c
> 3) TSVN->add foo.c
> 4) TSVN->commit
>
> The above example would probably be a mistake where the
> user actually
> should have reverted the deletion at step 2.
>
> If the replacment item arrives by means of an svn copy then
> it will have
> different history to the item it replaced - you can confuse
> yourself on
> this one if you like by reading about "peg
> revisions" in the manuals...
>
>

Thank you, that sounds more like it. If it was replaced with an identical file.. presumably it would still show up as modified?

Also, if i merged a branch that did a delete and an add.. that would look like this?

thanks.

-----------------------
N: Jon Hardcastle
E: Jon_at_eHardcastle.com
'The writing is on the wall...'
-----------------------

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe_at_tortoisesvn.tigris.org
For additional commands, e-mail: users-help_at_tortoisesvn.tigris.org
Received on 2008-06-03 16:59:01 CEST

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