Code::Blocks Forums
Developer forums (C::B DEVELOPMENT STRICTLY!) => Development => CodeCompletion redesign => Topic started by: ollydbg on July 13, 2010, 03:40:38 am
-
@Morten and other dev.
If I want to track or blame the last codecompletion refactor branch, which is created and maintained in year 2009. How can I do that?
For the current cc branch, I can only show the change log from: rev 6221 (the new ccbranch is created ) to rev 6392. If I remember correctly, when the rev 6221 is created, you have delete the old cc branch, right?
Thanks.
-
What about this:
http://svn.berlios.de/wsvn/codeblocks/branches/codecompletion_refactoring/?op=log&isdir=1&
and (e.g) this:
http://svn.berlios.de/wsvn/codeblocks/trunk/src/plugins/contrib/EditorTweaks/EditorTweaks.cpp?op=blame&rev=6386&peg=6386
I personally use the transaction feature of my SVN client (SmartSVN). This shows you changes in any (sub-)tree in real time. I believe TortoiseSVN has such, too - but I am not sure.
-
What about this:
http://svn.berlios.de/wsvn/codeblocks/branches/codecompletion_refactoring/?op=log&isdir=1&
thanks for the reply. But this link can only show the change from:6221 to rev 6392 in CCbranch.
Before rev 6392, all the reversions were in "trunk" .
So, I just guess that we still can't see the last cc_branch(For example: ccbranch from 2009 may to 2009 july).
It just show the same thing in my TortoiseSVN. All the log information before 6392 was related to trunk (no information about the last cc_branches was shown)
Edit
BTW: the last cc_branch merged to trunk is in rev 5770, with the log:
* merged with codecompletion_refactoring branch
But I can't see the revision information of ccbranch before rev 5770. the information change may get lost??? :(
-
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.
-
Ollydbg: tortoise svn has a checkbox "stop on copy/rename", ensure that it is not checked.
-
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.
thanks for your reply. I have tried it , but it still get the information of trunk...
Ollydbg: tortoise svn has a checkbox "stop on copy/rename", ensure that it is not checked.
thanks for the hint, I have done that already. :D
-
@all.
Here is the reply from svn maillist:
> 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.
So, can we solve our problem?
-
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.
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.
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?
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.
-
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.
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 (http://chestofbooks.com/computers/revision-control/subversion-svn/Resurrecting-Deleted-Items-Branchmerge-Advanced-Resurrect.html)
I'm not an svn guru, so sorry if I'm wrong. :D