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

Re: I think I'm in big trouble! (committed changes error)

From: Rolf Marsh <rmmarsh_at_fastmail.us>
Date: Wed, 20 Jan 2010 07:29:36 -0800

Most of the files are marked "under version control but are missing or
incomplete", while a few are marked as "modified" which is what I
expected. Is there a way to do a "commit" of everything? Or, is there
a way to replace all of the files in the repository with those on the
flash drive?

R

On 1/20/2010 7:19 AM, C. Michael Pilato wrote:
> I can't speak to AnkhSVN's behavior -- don't use it myself.
>
> What does 'svn status' in that working copy show? Are you local
> modifications still sitting there waiting to be committed?
>
>
> Rolf Marsh wrote:
>
>> I believe the commit did succeed, because all of the AnkhSVN glyphs were
>> gone... here is the current "svn info" on the flash drive; the F drive
>> is on the desktop. I know the flash drive is the latest.. should I do
>> another commit while it's connected to the desktop?
>>
>>
>> L:\Inventory Program - Working Copy>svn info
>> Path: .
>> URL: file:///F:/Repository/trunk/Prager%20Book%20Maintenance
>> Repository Root: file:///F:/Repository
>> Repository UUID: 13b279d9-a03c-d346-aaa8-def0303d8a0c
>> Revision: 10
>> Node Kind: directory
>> Schedule: normal
>> Last Changed Author: Rolf
>> Last Changed Rev: 6
>> Last Changed Date: 2010-01-07 15:55:58 -0800 (Thu, 07 Jan 2010)
>>
>>
>> On 1/20/2010 6:50 AM, C. Michael Pilato wrote:
>>
>>> Rolf Marsh wrote:
>>>
>>>
>>>> Let me see if I can clarify this better... my (supposedly one and only)
>>>> repository is on my desktop at home. I have one (1) working copy, which
>>>> is on my flash drive. I normally do a commit after making changes when
>>>> the flash drive is attached to the home desktop.
>>>>
>>>> This time, I did a commit before leaving for work while the flash drive
>>>> was connected to the home desktop. I went to work, made some changes to
>>>> the working copy, and foolishly did a commit while the flash drive was
>>>> connected to my laptop. I don't believe there is a repository on the
>>>> laptop, at least that I knowingly created.
>>>>
>>>>
>>> Did the commit succeed? If not, no big deal. Just take the drive home and
>>> commit again to the desktop repository.
>>>
>>> If it did succeed, then you've some explaining to do. Subversion won't
>>> likely let you commit changes (which are expressed as deltas against some
>>> known base, complete with checksums to verify file contents, etc.) easily
>>> into the wrong repository. Is it possible that your repository -- which you
>>> thought lived on the desktop box -- actually rests on the same flash drive?
>>> What does 'svn info' in your working copy reveal about the Repository Root?
>>>
>>>
>>>
>
>
Received on 2010-01-20 16:30:10 CET

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