You are viewing a plain text version of this content. The canonical link for it is here.
Posted to users@subversion.apache.org by Jon Biddell <jo...@mandrake.net.au> on 2006/08/01 02:13:34 UTC
n00b repository question
Hi,
Firstly, I'm a complete n00b at subversion - in fact, I installed it
less than 2 hours ago.
I'm currently reading the book, but I can't see, or maybe I'm just
missing it, whether or not I can get it to do what I need. Here's the
situation;
Website developed outside subversion - customised for my employer.
New website from the supplier which has to replace the "live"
website.... BUT our changes to the "live" site must be merged into
the new one from the supplier, and then released...
I've created a repository containing the "vanilla" site and that went
OK.
I would have thought that the easiest way to do this would have been
to make the "live" site the working copy and then merge stuff
back.... but possibly not. When I copied the "live" site to the
directory I used for the checked-out working copy, I get "directory
not locked" errors when I try to commit...
If someone can give me a solution, or pointers thereto, I'd be most
appreciative.
Jon
---------------------------------------------------------------
Some people says that if you play a Windows XP install CD backwards
you will hear demon voices commanding you to worship Satan". But
that's nothing. If you play it forward it will install Windows XP !!
Re: n00b repository question
Posted by Jon Biddell <jo...@mandrake.net.au>.
>> While I'm happy, nay, I *prefer* to work with a command line tool,
>> another less Linux-savvy member of the team is making noises about a
>> GUI of some sort that will allow diff compares and manual merges /
>
> The Subclipse plugin in Eclipse is excellent.
>
Thanks John - I'll take a look at it...
Jon
---------------------------------------------------------
A Microsoft Certified System Engineer is to
computing what a McDonalds Certified
Food Specialist is to fine cuisine.
Apache vs Svnserve
Posted by Anastasios Angelidis <vo...@videotron.ca>.
What does this mean exactly?
Authorization options blanket read/write access, or per-directory
read/write control blanket read/write access, or per-directory write
(but not read) control using a pre-commit hook
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Re: n00b repository question
Posted by John Allen <jo...@dublinux.net>.
On Wed 02 Aug 2006 10:03, Jon Biddell wrote:
> On Tuesday 01 August 2006 18:27, Ulrich Eckhardt wrote:
> > On Tuesday 01 August 2006 04:13, Jon Biddell wrote:
> > > Website developed outside subversion - customised for my employer.
> > > New website from the supplier which has to replace the "live"
> > > website.... BUT our changes to the "live" site must be merged into
> > > the new one from the supplier, and then released...
>
> [much snipping occured >here<]
>
> Uli,
>
> Many thanks for those helpful hints. Part of my problem, IMHO, was a
> case of install-before-rtfm, unfortunately.
>
> I'm going to read the book overnight and try your suggestions again
> tomorrow.
>
> While I'm happy, nay, I *prefer* to work with a command line tool,
> another less Linux-savvy member of the team is making noises about a
> GUI of some sort that will allow diff compares and manual merges /
The Subclipse plugin in Eclipse is excellent.
> commits - I believe TRAC will allow part of this, but it has to be a
> completely foolproof system - which, as we all know, does not exist !!
>
> I'm also trying all of this on a Mac Powerbook, but ultimately it will
> run on a Debian box (probably my spare Qube2).
>
> Again, my thanks...
>
> Jon
--
John Allen mailto:john.allen@moyville.net
Mandriva Club Member(Silver) http://www.moyville.net
Site of the day http://www.lightabigfire.com/
Mandriva Linux release 2006.0 (Official) for i586, kernel 2.6.12-22mdk
14:39:22 up 7 days, 22:54, 1 user, load average: 0.23, 0.32, 0.36
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Re: n00b repository question
Posted by Jon Biddell <jo...@mandrake.net.au>.
On Tuesday 01 August 2006 18:27, Ulrich Eckhardt wrote:
> On Tuesday 01 August 2006 04:13, Jon Biddell wrote:
> > Website developed outside subversion - customised for my employer.
> > New website from the supplier which has to replace the "live"
> > website.... BUT our changes to the "live" site must be merged into
> > the new one from the supplier, and then released...
[much snipping occured >here<]
Uli,
Many thanks for those helpful hints. Part of my problem, IMHO, was a
case of install-before-rtfm, unfortunately.
I'm going to read the book overnight and try your suggestions again
tomorrow.
While I'm happy, nay, I *prefer* to work with a command line tool,
another less Linux-savvy member of the team is making noises about a
GUI of some sort that will allow diff compares and manual merges /
commits - I believe TRAC will allow part of this, but it has to be a
completely foolproof system - which, as we all know, does not exist !!
I'm also trying all of this on a Mac Powerbook, but ultimately it will
run on a Debian box (probably my spare Qube2).
Again, my thanks...
Jon
--
You will not be elected to public office this year.
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Re: n00b repository question
Posted by Ryan Schmidt <su...@ryandesign.com>.
On Aug 1, 2006, at 10:27, Ulrich Eckhardt wrote:
> On Tuesday 01 August 2006 04:13, Jon Biddell wrote:
>> Website developed outside subversion - customised for my employer.
>> New website from the supplier which has to replace the "live"
>> website.... BUT our changes to the "live" site must be merged into
>> the new one from the supplier, and then released...
[snip]
> There is a tool called svn_load_dirs. [snip]
There is a chapter in the book that explains this scenario:
http://svnbook.red-bean.com/en/1.2/svn.advanced.vendorbr.html
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Re: n00b repository question
Posted by Ulrich Eckhardt <ec...@satorlaser.com>.
On Tuesday 01 August 2006 04:13, Jon Biddell wrote:
> Website developed outside subversion - customised for my employer.
> New website from the supplier which has to replace the "live"
> website.... BUT our changes to the "live" site must be merged into
> the new one from the supplier, and then released...
Okay, so far so good. There are basically two branches that have to be merged.
The common point is Vendor v1, which then developed into Vendor v2 and
Custom. There are basically two ways to merge those two branches, you could
merge the difference between Vendor v1 and Vendor v2 into Custom or you could
merge the difference between Vendor v1 and Custom into Vendor v2 - the
results should be identical.
> I've created a repository containing the "vanilla" site and that went
> OK.
>
> I would have thought that the easiest way to do this would have been
> to make the "live" site the working copy and then merge stuff
> back.... but possibly not. When I copied the "live" site to the
> directory I used for the checked-out working copy, I get "directory
> not locked" errors when I try to commit...
It's hard to tell what exactly went wrong here, but I guess that this coping
damaged or otherwise affected Subversion's internals. If you want a
diagnosis, provide a complete recipe for reproduction. Also remember that
copying things into a working copy does not add them to the version control!
> If someone can give me a solution, or pointers thereto, I'd be most
> appreciative.
There is a tool called svn_load_dirs. The first thing you do is load the
initial Vendor v1 version into the repository.
Then, you check this out to a working copy (optionally after creating e.g. a
Custom v1 branch) and apply your own modifications. You can do this in as
many steps as you want (in order to keep separate changes in separate
commits) or in just one step (if you don't intend to only partially merge
your changes). Being able to partially merge is a good thing though, in
particular if the merging creates any conflicts.
Then, you svn_load_dirs the Vendor v2 into the repository (right on top of the
first) and merge the changes on the former version into it. If you created a
branch in the second step, you create another one now (Custom v2) where you
merge all the changes on branch Custom v1 (or just those you want and that
apply without conflicts - hence the advantage of fine-grained changes).
Uli
****************************************************
Visit our website at <http://www.domino-printing.com/>
****************************************************
This Email and any files transmitted with it are intended only for the person or entity to which it is addressed and may contain confidential and/or privileged material. Any reading, redistribution, disclosure or other use of, or taking of any action in reliance upon, this information by persons or entities other than the intended recipient is prohibited. If you are not the intended recipient please contact the sender immediately and delete the material from your computer.
E-mail may be susceptible to data corruption, interception, viruses and unauthorised amendment and Domino UK Limited does not accept liability for any such corruption, interception, viruses or amendment or their consequences.
****************************************************
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org