Merge lp:~abentley/launchpad/bugfix-bzr-builder into lp:launchpad

Proposed by tracy craig on 2011-08-24
Status: Merged
Merge reported by: tracy craig
Merged at revision: not available
Proposed branch: lp:~abentley/launchpad/bugfix-bzr-builder
Merge into: lp:launchpad
Diff against target: 20 lines (+8/-0) (has conflicts)
1 file modified
utilities/sourcedeps.conf (+8/-0)
Text conflict in utilities/sourcedeps.conf
To merge this branch: bzr merge lp:~abentley/launchpad/bugfix-bzr-builder
Reviewer Review Type Date Requested Status
Launchpad code reviewers 2011-08-24 Pending
Review via email: mp+72685@code.launchpad.net
To post a comment you must log in.
Aaron Bentley (abentley) wrote :

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

Hi Tracy,

Why did you propose this merge?

Aaron

On 11-08-24 04:45 AM, tracy craig wrote:
> tracy craig has proposed merging lp:~abentley/launchpad/bugfix-bzr-builder into lp:launchpad.
>
> Requested reviews:
> Launchpad code reviewers (launchpad-reviewers)
>
> For more details, see:
> https://code.launchpad.net/~abentley/launchpad/bugfix-bzr-builder/+merge/72685

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iEYEARECAAYFAk5VC3gACgkQ0F+nu1YWqI20EgCeMU24dBpVzXeO8SPp5zyyDAkj
qNYAn3uv7UxIILff0PbGxVafkTh8j8ut
=TA1J
-----END PGP SIGNATURE-----

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'utilities/sourcedeps.conf'
2--- utilities/sourcedeps.conf 2011-08-21 22:06:09 +0000
3+++ utilities/sourcedeps.conf 2011-08-24 08:44:52 +0000
4@@ -1,8 +1,16 @@
5+<<<<<<< TREE
6 bzr-builder lp:~launchpad-pqm/bzr-builder/trunk;revno=68
7 bzr-git lp:~launchpad-pqm/bzr-git/devel;revno=259
8 bzr-hg lp:~launchpad-pqm/bzr-hg/devel;revno=290
9 bzr-loom lp:~launchpad-pqm/bzr-loom/trunk;revno=49
10 bzr-svn lp:~launchpad-pqm/bzr-svn/devel;revno=2717
11+=======
12+bzr-builder lp:~launchpad-pqm/bzr-builder/trunk;revno=67
13+bzr-git lp:~launchpad-pqm/bzr-git/devel;revno=258
14+bzr-hg lp:~launchpad-pqm/bzr-hg/devel;revno=283
15+bzr-loom lp:~launchpad-pqm/bzr-loom/trunk;revno=48
16+bzr-svn lp:~launchpad-pqm/bzr-svn/devel;revno=2710
17+>>>>>>> MERGE-SOURCE
18 cscvs lp:~launchpad-pqm/launchpad-cscvs/devel;revno=432
19 dulwich lp:~launchpad-pqm/dulwich/devel;revno=426
20 difftacular lp:difftacular;revno=6