Using SVN
|
triangular
Joined: 2005-12-21
Posts: 138 |
Posted: Tue, 2007-02-20 13:19
|
|
I'm going to ask that you please not send me to a faq about this, because I've been reading them in several places but I just don't understand them. I know enough to screw up my working installation, and that's what scares me. If you can help with a clear direction, I will so much appreciate it. I currently have a working G2 install (latest official upgrade release ver. 2.1.x) at gallery.mysite.com. I'm hosted at Dreamhost which has SVN installed, and followed as much of a wiki there as I could, creating my own SVN repository at svn.gallery.mysite.com but I am totally lost after that. The docs here at menalto don't seem that complex for using SVN, but its SVN itself I'm not familiar with. The docs here refer to doing something like 'cd gallery', 'svn checkout repository.name.com/../', but they don't mention using the commit command. From the rest of the doc here, I understand I would have to look at each file with a 'C' on it for any conflicts I would need to resolve. But how do I get to this point? Do I need to use the commit command for anything? What do I do with the svn.gallery.mysite.com repository I created according to the docs on my web hosting service? I can telnet into my site and have access to the SVN command line there. I want to update from latest G2 2.1 official upgrade to the latest SVN so I can install the newer PGTheme (x_treme) version, which doesn't work without the latest svn core and API. Can anyone please instruct me? Please?? Christian |
|
Posts: 32509
since you said you read faqs, I assume you read already our guide to subversion at:
http://codex.gallery2.org/Gallery:Using_Subversion
so your question isn't about checking out G2 from our SVN repository on sf.net.
you actually want to have your own SVN repository to maintain your local changes, right?
so your workflow would be:
1. checkout G2 from sf.net SVN repository
2. commit this initial g2 version to your own SVN repository in the main branch and in a vendor branch
3. start customizing your g2, edit files and commit the changes to your own SVN repository
4. if there's an upgrade for g2,
4.1. update your vendor branch
4.2. merge your local changes with the vendor branch
that's about the same thing we do for gallery.menalto.com.
see:
http://codex.gallery2.org/GMC:Upgrading_Drupal
--------------
Doumentation: Support / Troubleshooting | Installation, Upgrade, Configuration and Usage
Posts: 138
Valient,
Thank you for your reply. I am just this week able to try this again.
Well, I really don't know. Do I need to do that? I am the first one to tell you that I am confused, so please be patient with that. I did read the docs you pointed to, many times. However I also read docs for using SVN at my hosting service, and whatever I did not initially understand became even more murky. I guess my question is simply about using the proper SVN commands in the proper directories and in the proper order.
My G2 sits on gallery.mydomain.com. Following docs from my hosting service, I created a subdomain called svn.gallery.mydomain.com. If I actually need to do this or not I'm unclear on. My hosting service SVN docs also talk a lot about creating security keys for the SVN process. The docs here at G2 only say I should type " svn checkout https://gallery.svn.sourceforge.net/svnroot/gallery/trunk/gallery2" to get the latest "copy", but it does not say what directory I should be in when I do that. The G2 root? Also, if this is a copy, where does it put that copy? Is the copy the actual update, or do I need my own repository locally? If I do, I still don't know how to transfer those changes to my installation.
And the G2 docs don't really specify if there is a step necessary to actually update the code after doing the checkout. It only says I should type "svn update" (with nothing after it) if its been a while since the last checkout. I assume I would type that into the same directory I typed the "checkout" command (the G2 root?).
The only reason I have not attempted to experiment too much with this is because I am kind of worried about screwing up my installation, backups and all I just don't want the headache of coming back here and asking for confusing repair help.
I don't know why my hosting service talks so much about an SVN subdomain and security keys, but I really just want somebody to tell me exactly what to type in what directories, in the steps necessary to just update this G2 code. I simply want to install the PG X_treme theme and it says in my Admin/Themes panel: Core API Required: 7.10 (available: 7.3), with Theme API Required: 2.4 (available: 2.3). The x_treme docs state it needs the latest SVN code to work.
So is walking me through what commands to type in the right directories too much to ask? If it is, I won't complain. But I'm very confused about what I hope is actually a simple process for my requirement. If you believe the G2 SVN docs are straightforward and clear enough, it is probably because you understand more about SVN than a person who has never used it at all. I have really tried to follow this but I'm still left with these questions.
Thanks for your efforts,
Christian
Posts: 138
Valient,
Thank you for your reply. I am just this week able to try this again.
Well, I really don't know. Do I need to do that? I am the first one to tell you that I am confused, so please be patient with that. I did read the docs you pointed to, many times. However I also read docs for using SVN at my hosting service, and whatever I did not initially understand became even more murky. I guess my question is simply about using the proper SVN commands in the proper directories and in the proper order.
My G2 sits on gallery.mydomain.com. Following docs from my hosting service, I created a subdomain called svn.gallery.mydomain.com. If I actually need to do this or not I'm unclear on. My hosting service SVN docs also talk a lot about creating security keys for the SVN process. The docs here at G2 only say I should type " svn checkout https://gallery.svn.sourceforge.net/svnroot/gallery/trunk/gallery2" to get the latest "copy", but it does not say what directory I should be in when I do that. The G2 root? Also, if this is a copy, where does it put that copy? Is the copy the actual update, or do I need my own repository locally? If I do, I still don't know how to transfer those changes to my installation.
And the G2 docs don't really specify if there is a step necessary to actually update the code after doing the checkout. It only says I should type "svn update" (with nothing after it) if its been a while since the last checkout. I assume I would type that into the same directory I typed the "checkout" command (the G2 root?).
The only reason I have not attempted to experiment too much with this is because I am kind of worried about screwing up my installation, backups and all I just don't want the headache of coming back here and asking for confusing repair help.
I don't know why my hosting service talks so much about an SVN subdomain and security keys, but I really just want somebody to tell me exactly what to type in what directories, in the steps necessary to just update this G2 code. I simply want to install the PG X_treme theme and it says in my Admin/Themes panel: Core API Required: 7.10 (available: 7.3), with Theme API Required: 2.4 (available: 2.3). The x_treme docs state it needs the latest SVN code to work.
So is walking me through what commands to type in the right directories too much to ask? If it is, I won't complain. But I'm very confused about what I hope is actually a simple process for my requirement. If you believe the G2 SVN docs are straightforward and clear enough, it is probably because you understand more about SVN than a person who has never used it at all. I have really tried to follow this but I'm still left with these questions.
Thanks for your efforts,
Christian