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

Re: 3 propositions for evolutions

From: Rick Yorgason <rick_at_firefang.com>
Date: 2007-02-13 02:33:21 CET

Scott Nicolson wrote:
>> So, right-click, go to TortoiseSVN->Update to revision, and enter the
>> revision from before the change happened. It will undo the updates.

There are many ways you could find the right revision, such as pressing
the log button after the update to see which revisions were included, or
looking through the logs for a file that you noticed shouldn't have changed.

By the way, your problem (updating when you intended to branch) wouldn't
have been fixed by asking before merging. In fact, it would have been
*worse*, because the files you *didn't* touch would still have been
updated, because they didn't need to be merged.

Take this example:

You have two files. foobar.h and foobar.cpp. You, and your coworker
Fred are working on them.

You start fixing some bugs in foobar.cpp, but don't touch foobar.h.

Fred adds a new function declaration to foobar.h and the function
definition in foobar.cpp. He commits his change.

You accidentally update. It updates foobar.h, because it can update
that without merging. It asks you if you want to merge foobar.cpp, and
you say no.

Now your header file is newer than your .cpp file. When you try to
compile, your compiler tells you that it can't find the new function
that was defined.


To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Tue Feb 13 02:33:20 2007

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

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