Removal of a branch?
drupaloSa - May 25, 2008 - 21:15
| Project: | Drupal.org infrastructure |
| Component: | CVS |
| Category: | support request |
| Priority: | normal |
| Assigned: | Unassigned |
| Status: | closed |
Jump to:
Description
When i became the new maintainer of TR translation project, I created a new D6 branch but it seems i have made a big mistake (i was new to all this cvs thing). Currently there aren't any files under D6 branch, and all the new 6.x files are under HEAD. So i suppose i have to recreate D6 branch in order to transfer them. Can someone help me with this, i'm really lost here :(.
#1
You can add the files to your branch in a number of ways - no reason to delete the branch.
One way would be to checkout DRUPAL-6--1 in one directory, and HEAD in another. Copy all the HEAD files to your DRUPAL-6--1 directory, then do
cvs add *and then commit the files.Alternately, checkout HEAD, then make a patch file like
cvs diff -N -rDRUPAL-6--1 > fix.patch, thencvs up -rDRUPAL-6--1, then patch to create the files withpatch -p0 < fix.patch, then docvs add *and then commit the files.Probably where you got off track was that you needed to do
cvs up -rDRUPAL-6--1after you created the branch. In general, it's helpful to runcvs statusbefore doing anything.#2
I'm Windows user and i use Tortoise CVS to access cvs.
When i try to checkout DRUPAL-6--1 i get this message and nothing happens:
cvs checkout: cannot open CVS/Entries for reading: No such file or directory
And when i try the second method i get the following error:
cvs diff: I know nothing about fix.patch
#3
Could you please remove the branch or give me instructions on how to achieve this?
#4
drupaloSa:
Try doing
cvs tag -d DRUPAL-6--1I don't mean to hijack the issue, but I'm somewhat in the same boat. I did this with my module project:
Now I can't remove the tag, as it's tied to the release node (can't change back to HEAD). Should I live with the error and keep developing in DRUPAL-6--1? Or could someone jump in and fix this?
Project: ext
Thanks!
#5
I can't do that, it's tied to a release node.
#6
Finally i was able to check out the empty -6--1 branch using Eclipse (couldn't do this with Tortoise). Then i just copied my files in that folder and committed all. I guess this solves my problem.
#7
Glad you solved it. As for my project, I guess the best solution is to move HEAD into the DRUPAL-6--1 branch and work from there as if it was HEAD. When it's ready for a 6.x release, add the release tag, then copy the files into HEAD and it should be back to normal..
#8
I'm planning to do so as well.
#9
Automatically closed -- issue fixed for two weeks with no activity.