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

Re: Updating the repository from wildcat user update

From: Simon Large <simon.tortoisesvn_at_gmail.com>
Date: Tue, 29 May 2012 13:06:55 +0100

On 29 May 2012 12:21, Steve Swift <steve.j.swift_at_gmail.com> wrote:
> We're just at the point of migrating to SVN, but we had a problem at the weekend which required the duty person to apply an emergency fix. He had his own copy (not a working copy) of the code, so he updated three files, compiled it, and fixed the problem.
>
> This left me with the issue of integrating his updates back into the repository.
>
> I compared his files with my working copy, and there were only three files that differed. So far, so good. I copied his files into my working copy, and committed the update. Back on a level keel.
>
> Is there a more elegant way to have handled this?

He needs to get his own working copy. Anyone who works on the code
needs to have their own working copy, otherwise you lose most of the
benefit of having a collaborative revision control system.

> At the very least, it would have been nice had the update appeared to have come from my colleague's ID and not mine.

You can do that retrospectively to fix this instance. Show log for the
folder, right click on the revision in question and select Edit
Author.

Simon

-- 
:       ___
:  oo  // \\      "De Chelonian Mobile"
: (_,\/ \_/ \     TortoiseSVN
:   \ \_/_\_/>    The coolest Interface to (Sub)Version Control
:   /_/   \_\     http://tortoisesvn.net
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2967650
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2012-06-02 02:13:41 CEST

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.