How to version with Bazaar this way

John Arbash Meinel john at arbash-meinel.com
Wed Oct 28 13:50:59 GMT 2009


-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Marius Boitor wrote:
> Hi,
> 
> I'm new to Bazaar (I've used something else till now) and need a bit of
> help. Usually I develop alone but sometimes I have a team. My usual
> development folder structure looks like this:
> 
> /var/www/domain.com/v1.0/htdocs <http://domain.com/v1.0/htdocs> for non
> secure files
> /var/www/domain.com/v1.0/htsdocs <http://domain.com/v1.0/htsdocs> for
> secure files
> 
> /var/www/domain.net/v1.0/htdocs <http://domain.net/v1.0/htdocs> for non
> secure files
> /var/www/domain.net/v1.0/htsdocs <http://domain.net/v1.0/htsdocs> for
> secure files
> ...
> 
> What I need is a bit of help on how can I setup Bazaar to be able to
> version my releases.
> I will not say that I did everything to setup Bazaar for this I didn't
> succeed but this is because the folders are already there and I don't
> really have the time to mess everything up thinking that I'm a beginner
> with Bazaar.
> 
> Any help will be highly appreciated.

- From your email it is unclear to me what the 'overlap' is. Specifically,
are the files in 'domain.net' the same as 'domain.com' or are they
separate domains?

Similarly, is there overlap between 'htdocs' and 'htsdocs' that you are
trying to preserve or are they separate documents?

If the htdocs and htsdocs are non-overlapping (my guess) and the files
between domains are mostly non-overlapping, then I would do something like:

cd /var/www/domain.net/v1.0
bzr init
bzr add # adds htdocs and htsdocs to 1 project
bzr commit -m "Initial import of the 1.0 sources"
bzr tag domain.net-1.0

cd ../v1.1
mv ../v1.0/.bzr . # start with a clone of the 1.0 state

# Try to find renames, barring that, add new files, delete missing ones
bzr mv --auto
bzr add
bzr rm

bzr commit -m "Updating to the 1.1 release"
bzr tag domain.net-1.1

cd ../v1.2
mv ../v1.1/.bzr

# continue until you have all versions imported

When you are done, the *last* directory will have a .bzr with all of the
ancestry.

John
=:->
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (Cygwin)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iEYEARECAAYFAkroTEMACgkQJdeBCYSNAANRQQCgg8PlVXzgeWvcG14wpdPg2UJ0
ihQAoNPMR3brv34AoijlsjJDdZoQfRHB
=bQVg
-----END PGP SIGNATURE-----



More information about the bazaar mailing list