[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 06:43:56 -0800

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.

So, my plan now is to somehow replace everything in the repository (on
the desktop) with the working copy, since I know it has the latest
version. The only problem is I don't see anywhere in the docs where it
explains how to do that.

Thanks for the help so far... I appreciate it...

Regards,
Rolf

On 1/19/2010 10:59 PM, Ryan Schmidt wrote:
> On Jan 19, 2010, at 19:03, Rolf Marsh wrote:
>
>
>> On 1/19/2010 5:01 PM, Ryan Schmidt wrote:
>>
>>
>>> On Jan 19, 2010, at 18:58, Rolf Marsh wrote:
>>>
>>
>>>
>>>
>>>> This morning, I took my working copy, which is on a flash drive, and committed the changes to the hard drive on my desktop. I then went to work, made some more changes to the project on the flash drive (now attached to my laptop), and when I wasn't thinking, committed those changes. I assume they went to the laptop?
>>>>
>>>> So, the long and short of it is, I think my flash drive is out of synch with the desktop at home. How do I verify this and fix it?
>>>>
>>> In both cases, you committed to whatever repository the working copy is associated with.
>>>
>>
>
>> OK... that's what I thought... now how do I fix it, so the main (and supposedly only repository) reflects the latest changes?
>>
> I'm still unclear what you did, or what the problem is. A working copy is only linked to a single repository. You can have as many working copies of that repository as you like, stored in as many different places as you like. "svn commit" in any of them commits the changes in that working copy to the repository. "svn update" in any of the working copies retrieves the latest changes from the repository. Further information on how to use Subversion is in the book:
>
> http://svnbook.org
>
> I am assuming you have two working copies, one on your desktop hard drive, and one on your flash drive, and that your repository is located in neither of those places but on some server somewhere. But it's hard to tell from your description.
>
>
> On Jan 19, 2010, at 19:08, Rolf Marsh wrote:
>
>
>>> "svn info" on the working copy path will tell you the address of the repository.
>>>
>> Hi Ryan... I don't see a "svn info" (attached a screen shot)
>>
>> <moz-screenshot-41.png>
>>
>
> The screenshot looked like a Windows directory listing of your working copy, which isn't relevant. You need to use a Subversion client to ask the working copy for information. For example, in a terminal window, change to directory of your working copy and type "svn info" to see the repository URL with which the working copy is associated. That is where your changes got committed to.
>
>
> P.S: Remember to Reply All so your replies go to the list too, not just to me.
>
>
>
Received on 2010-01-20 15:44:30 CET

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