I'm stuck again!
Lets say revision 35 is good. Then some fool checks it out, deletes all the .cpp files, and commits the change (ok, worst case senerio! but I've worked with some monkeys in the past, and u never know!).
So rev 36 has loads missing.
Mr fix-it (me!) notices r36 (head) is total junk, so I check out r35. I want to make r35 become r37, the new head, how can I do that??
If I 'check for updates' is shows me what's the problem, but 'updating' only makes my checked-out r35 look like the junk r36.
Merging (35 to head) seems to just delete everything (giving me r36) too, just like an update. I guess that's cos it's not a seperate branch?? I'm a bit fuzzy on merging...
I can't commit my untouched r35, because it says there is 'no change'.
Help!
John
-----Original Message-----
From: Martin Tomes [mailto:lists@tomes.org]
Sent: Wed 21/07/2004 10:30
To: dev@tortoisesvn.tigris.org
Cc:
Subject: Re: [TSVN] Restoring a project to earlier revision[Scanned]
JS.staff wrote:
> Thanks for the info.
>
> I'm new to all this, How do I merge two committed revisions like that? Can I merge without making working copies?
>
> Or should I just checkout a 'good' revision, then merge that with current head?
You need to check out a working copy of the HEAD revision then do the merge to undo the changes
which you don't want. Then you will have to resolve any conflicts and do a commit.
--
Martin Tomes
echo 'martin at tomes x org x uk'\
| sed -e 's/ x /\./g' -e 's/ at /@/'
The Subversion Wiki is at http://www.subversionary.org/
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Wed Jul 21 13:43:42 2004