Bzr

Differences between revisions 7 and 14 (spanning 7 versions)
Revision 7 as of 2013-03-19 15:21:38
Size: 3834
Editor: zequence
Comment:
Revision 14 as of 2013-04-01 04:10:24
Size: 3925
Editor: zequence
Comment:
Deletions are marked like this. Additions are marked like this.
Line 2: Line 2:
<<Include(UbuntuStudio/Navigation/DevSideBar)>> ||<tablestyle="width: 30%; float: right; background-color: #e1f0f4; border-radius: 10px;"><<Include(UbuntuStudio/Navigation/DevSideBar)>>||


<<TableOfContents(2)>>
Line 15: Line 18:

||<#f4f0cb>bzr branch ubuntu:<package>||
{{{
$ bzr branch ubuntu:<package>
}}}
Line 19: Line 23:

||<#f4f0cb>bzr branch ubuntu:jackd2||
{{{
$ bzr branch ubuntu:jackd2
}}}
Line 23: Line 28:

||<#f4f0cb>bzr branch ubuntu:<release>/<package>||
{{{
$ bzr branch ubuntu:<release>/<package>
}}}
Line 27: Line 33:

||<#f4f0cb>bzr branch ubuntu:precise/jackd2 jackd2-precise||
{{{
$ bzr branch ubuntu:precise/jackd2 jackd2-precise
}}}
Line 33: Line 40:

||<#f4f0cb>bzr branch lp:~ubuntustudio-dev/ubuntustudio-default-settings/UbuntuStudio ubuntustudio-default-settings||
{{{
$ bzr branch lp:~ubuntustudio-dev/ubuntustudio-default-settings/UbuntuStudio ubuntustudio-default-settings
}}}
Line 38: Line 46:
Before you start working, you might want to update your bzr branch. Do this only if it's a clean bzr branch with no uncommitted or pushed changes. To pull latest changes from the default remote branch to this local branch, do:

||<#f4f0cb>bzr pull||
Before you start working, you might want to update your bzr branch. Do this only if it's a clean bzr branch with no uncommitted or unpushed changes. To pull latest changes from the default remote branch to this local branch, do:
{{{
$ bzr pull
}}}
Line 43: Line 52:

||<#f4f0cb>bzr pull <location>||
{{{
$ bzr pull <remote_adress>
}}}
Line 51: Line 61:
{{{
$ bzr add <yournewfile>
}}}
Line 52: Line 65:
||<#f4f0cb>bzr add <yournewfile>||

Though y
ou'll seldom do it this way (since you're propably working on a debian package), this is how to create a standard bzr commit:

||<#f4f0cb>bzr commit -m "a description of your commit"||
You'll seldom do it this way (since you're propably working on a debian package), but this is how to create a standard bzr commit:
{{{
$ bzr commit -m "a description of your commit"
}}}
Line 59: Line 71:

||<#f4f0cb>debcommit||
{{{
$ debcommit
}}}
Line 67: Line 80:

||<#f4f0cb>lp:~<your-lp-username>/+junk/<branchname>||
{{{
$ bzr push lp:~<your-lp-username>/+junk/<branchname>
}}}
Line 71: Line 85:

||<#f4f0cb>bzr push lp:~ubuntustudio-dev/ubuntustudio-default-settings/UbuntuStudio||
{{{
$ bzr push lp:~ubuntustudio-dev/ubuntustudio-default-settings/UbuntuStudio
}}}
Line 75: Line 90:

||<#f4f0cb>bzr push lp:~<yourlpid>/ubuntu/<release>/<package>/<branchname>||
{{{
$ bzr push lp:~<yourlpid>/ubuntu/<release>/<package>/<branchname>
}}}
Line 79: Line 95:

||<#f4f0cb>bzr push lp:~zequence/ubuntu/jackd2/fix-for-956438||
{{{
$ bzr push lp:~zequence/ubuntu/jackd2/fix-for-956438
}}}
Line 83: Line 100:

||<#f4f0cb>bzr push lp:~zequence/ubuntu/precise/jackd2/fix-for-956438||
{{{
$ bzr push lp:~zequence/ubuntu/precise/jackd2/fix-for-956438
}}}
Line 89: Line 107:
{{{
$ bzr uncommit
}}}
Line 90: Line 111:
||<#f4f0cb>bzr uncommit||

Removing all changes that happened since last commit, is done with:

||<#f4f0cb>bzr revert||
Removing all changes in files that happened since last commit, is done with:
{{{
$ bzr revert
}}}

What is Bazaar?

Bazaar is a GNU version control system, sponsored by Canonical and used for keeping track of sources at code.launchpad.net. Most, or all Ubuntu sources exist as bzr branches.

bzr command cheat sheet

Get Ubuntu Source

There are some nice builtin functionalities in bzr. Getting Ubuntu source is one of them.

Get the source for a development release branch:

$ bzr branch ubuntu:<package>

For example:

$ bzr branch ubuntu:jackd2

Or, if you want the source for a specific release:

$ bzr branch ubuntu:<release>/<package>

For example (renaming the local branch to jackd2-precise):

$ bzr branch ubuntu:precise/jackd2 jackd2-precise

Get other misc source

Getting non Ubuntu branches will require you to get the adress to the source from launchpad, and branch it like:

$ bzr branch lp:~ubuntustudio-dev/ubuntustudio-default-settings/UbuntuStudio ubuntustudio-default-settings

Update branch

Before you start working, you might want to update your bzr branch. Do this only if it's a clean bzr branch with no uncommitted or unpushed changes. To pull latest changes from the default remote branch to this local branch, do:

$ bzr pull

You can additionally decide from where to pull with:

$ bzr pull <remote_adress>

bzr commits

Warning /!\ Do not add several features and then commit them all at once. This makes it hard to oversee changes. However, making a feature change often means that you edit more than one file. So, it is the feature that should be commited, not each changed file by itself.

To make a commit, you would first make changes. To make new files commitable, you would first need to:

$ bzr add <yournewfile>

You'll seldom do it this way (since you're propably working on a debian package), but this is how to create a standard bzr commit:

$ bzr commit -m "a description of your commit"

If you're working on a Debian package, you'll first edit debian/changelog, and then use debcommit. debcommit reads debian/changelog and uses the descriptions of changes from there. Read more about documenting Debian changes

$ debcommit

bzr push

To "upload" your changes, you'll need to push them. This is done with the bzr push command. Without rights, you can't push to a Ubuntu branch directly. You can only push to bzr branches you own or have rights to push to. And bzr branches can either belong to a project, or be temporary personal "junk" branches.

To push to your own junk branch, make up a name for the branch when you push:

$ bzr push lp:~<your-lp-username>/+junk/<branchname>

Or, upload to an existing project branch for which you have rights, for example:

$ bzr push lp:~ubuntustudio-dev/ubuntustudio-default-settings/UbuntuStudio

Usually, when you're fixing a bug to an existing Ubuntu project branch, you'll create a paralell branch for it with the command:

$ bzr push lp:~<yourlpid>/ubuntu/<release>/<package>/<branchname>

So, for example, if it's a development release of jackd2, it would be something like:

$ bzr push lp:~zequence/ubuntu/jackd2/fix-for-956438

Or, for a specific release:

$ bzr push lp:~zequence/ubuntu/precise/jackd2/fix-for-956438

Arggh, I want to undo changes

Removing just the last commit, but not changing any files is done with:

$ bzr uncommit

Removing all changes in files that happened since last commit, is done with:

$ bzr revert

UbuntuStudio/Bzr (last edited 2013-05-17 01:32:45 by zequence)