Developer forums (C::B DEVELOPMENT STRICTLY!) > CodeCompletion redesign
How to track the old codecompletion branch
ollydbg:
--- Quote from: jens on July 13, 2010, 09:55:36 am ---I think this happens, because trunk was copied to cc-branch.
As workaround, you can checkout revision 5769 of cc-branch and view the log through svn and you get the correct entries.
--- End quote ---
thanks for your reply. I have tried it , but it still get the information of trunk...
--- Quote ---Ollydbg: tortoise svn has a checkbox "stop on copy/rename", ensure that it is not checked.
--- End quote ---
thanks for the hint, I have done that already. :D
ollydbg:
@all.
Here is the reply from svn maillist:
--- Quote ---> 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.
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.
--- End quote ---
So, can we solve our problem?
MortenMacFly:
--- Quote from: ollydbg on July 14, 2010, 02:10:14 am ---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.
--- End quote ---
I did this on purpose: Trying to do a re-integrate merge caused millions of conflicts which I was too lazy to fix manually (it's really an awful lot of work and error prone). So I decided to do it the delete/copy way.
--- Quote from: ollydbg on July 14, 2010, 02:10:14 am ---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.
So, can we solve our problem?
--- End quote ---
I guess no, because I still don't want to resolve all these conflicts. If another dev is willing to do so, step forward.
Why exactly do you need this btw? I still have a copy of the CC plugin branch before I did the update in the branch. However, if you remember: This had some serious bugs.
ollydbg:
--- Quote from: MortenMacFly on July 14, 2010, 07:15:10 am ---Why exactly do you need this btw? I still have a copy of the CC plugin branch before I did the update in the branch. However, if you remember: This had some serious bugs.
--- End quote ---
I know, I have no other meaning, just want to track all the changes in CC. :D.
So, is it possible you can still resurrecting the old cc branch in some where in the branches folder. You can change to another name like:
branches/codecompletion_refactoring_2009
see
Resurrecting Deleted Items
I'm not an svn guru, so sorry if I'm wrong. :D
Navigation
[0] Message Index
[*] Previous page
Go to full version