Re: [development] Tagging and branching, again.
When I got in trouble for branching someone else's contrib stuff, TortoiseCVS's remove branch command let me merge the 4-7 branch back into HEAD, deleting the 4-7 and just putting some weirdly, long numbered 1.6.1.2-type versions in the HEAD branch. I'll take a shot removing an unwanted 4-7 branch if someone tells me, gives permission, etc.
David K Norman wrote:
When I got in trouble for branching someone else's contrib stuff, TortoiseCVS's remove branch command let me merge the 4-7 branch back into HEAD, deleting the 4-7 and just putting some weirdly, long numbered 1.6.1.2-type versions in the HEAD branch. I'll take a shot removing an unwanted 4-7 branch if someone tells me, gives permission, etc.
Please don't do anything in our cvs repos if you don't understand what you are doing. the fact you use a windows graphical frontend tells me you most likely don't. So don't do it. We had more than one accident happen from inexperienced users and this typically leads to strange effects with project.module and a lot of time that people like me need to spend to fix it. Cheers, Gerhard
On 13 Apr 2006, at 11:39 PM, Gerhard Killesreiter wrote:
Please don't do anything in our cvs repos if you don't understand what you are doing. the fact you use a windows graphical frontend tells me you most likely don't. So don't do it.
We had more than one accident happen from inexperienced users and this typically leads to strange effects with project.module and a lot of time that people like me need to spend to fix it
In subversion, to create a new branch is : svn cp trunk/modules/modulename branches/DRUPAL-4-6/modules/modulename to remove a branch is : svn rm branches/DRUPAL-4-6/modules/modulename oh. and the windows and unix front ends handle this all superbly. *disclaimer* drupal doesn't run subversion. but i still think subversion is more sane for real people. -- Adrian Rossouw Drupal developer and Bryght Guy http://drupal.org | http://bryght.com
On Thu, 2006-04-13 at 23:21 +0200, Adrian Rossouw wrote:
In subversion, to create a new branch is : svn cp trunk/modules/modulename branches/DRUPAL-4-6/modules/modulename
to remove a branch is : svn rm branches/DRUPAL-4-6/modules/modulename
oh. and the windows and unix front ends handle this all superbly.
*disclaimer* drupal doesn't run subversion. but i still think subversion is more sane for real people.
Whatever happened as a result of our long rants of svn vs cvs vs bzr vs rcs vs sticky notes. I know I've really started to enjoy bzr for managing live websites and svn would be a welcome update from cvs in my book. If just to have sane branching, and some offline capabilities. I just hate it when I go to make a patch on the train ride home, and I can't cvs diff. /me hides in corner behind toughbook. .darrel.
Whatever happened as a result of our long rants of svn vs cvs
Let's not go there. Many of us are focused on getting the 4.7 release out. Many others are focused on updating their modules. Dries asked for this courtesy a couple months ago and I'm maintaining the focus in his absence. We will resume our regularly scheduled banter soon. Thanks. -moshe
On Thu, 2006-04-13 at 17:36 -0400, Moshe Weitzman wrote:
Whatever happened as a result of our long rants of svn vs cvs
Let's not go there. Many of us are focused on getting the 4.7 release out. Many others are focused on updating their modules. Dries asked for this courtesy a couple months ago and I'm maintaining the focus in his absence.
We will resume our regularly scheduled banter soon.
Thanks. -moshe
I'll concede for now. I am short on development bandwidth myself at the moment.
participants (5)
-
Adrian Rossouw -
Darrel O'Pry -
David K Norman -
Gerhard Killesreiter -
Moshe Weitzman