On 2010-7-14 8:02, Andy Levy wrote:
On Tue, Jul 13, 2010 at 19:55, asmwarrior<asmwarr...@gmail.com> wrote:
I have a problem to view(track an old branch), here are the steps what we
have done.
2009.04, we created a branch named "branches/codecompletion_refactoring"
from trunk.
2009.10, we merged the "branches/codecompletion_refactoring" to trunk, then
stop developing on the that branch.
2010.05, we would like to start developing on the branch again, so what we
done is:
1,Removed branches/codecompletion_refactoring
2,Copied trunk to branches/codecompletion_refactoring.
After that, we are develop on the new "branches/codecompletion_refactoring"
again.
Problem:
When I do a track to see the change log of the new
"branches/codecompletion_refactoring", we can only get the information from
2010.05 to now, before that, I get all the information of "trunk" not the
old branch.
So, is there any way we can track the old branch?
You'll have to use a peg revision to see the old branch; it's
effectively frozen in time now.
When you delete an item and re-create it with the same name, the new
one is a different entity in the repository database - there is no
connection between the old& new.
Thank you for the quick reply and explanation!!
In fact, I'm not a developer of Codeblocks IDE(I'm just an active
Codeblocks user and contributor), So I have paste your replies to the
forum post:
http://forums.codeblocks.org/index.php/topic,12897.msg87057.html#msg87057
Assuming you didn't svn merge --reintegrate, you could have merged
from trunk to branches/codecompletion_refactoring to get the branch
back in sync with the trunk. You could still do this by:
1) Delete the new branches/codecompletion_refactoring
2) Resurrect the old one with a reverse merge
3) Merge trunk to branches/codecompletion_refactoring& continue development.
In fact, from 2010.05, there are several merges from trunk to the new
"branches/codecompletion_refactoring", hope this method help the
codeblocks' developer to solve this problem.
Thanks
asmwarrior(ollydbg from codeblocks forum)
