Created by Barry Warsaw on 2010-09-27 and last modified on 2010-09-27
Get this branch:
bzr branch lp:~barry/bzr-builddeb/609186-urls
Only Barry Warsaw can upload to this branch. If you are Barry Warsaw please log in for upload directions.

Branch merges

Related bugs

Related blueprints

Branch information

Barry Warsaw

Recent revisions

483. By Barry Warsaw on 2010-09-27

Typo: forgot to return something ;)

482. By Barry Warsaw on 2010-09-27

LP: #609186

Add ubuntu: u: debian: and d: schemes, along with distroseries support.

481. By James Westby on 2010-09-10

Fix test fallout from having merge mode detection working.

480. By James Westby on 2010-09-10

Add a changelog entry for the test isolation fix.

479. By James Westby on 2010-09-10

Fix the auto-detection of merge mode. Thanks Jelmer.

478. By James Westby on 2010-09-10

Merge Jelmer's branch and credit him with the fix.

477. By James Westby on 2010-09-10

Split file_ids_from in to one we should take renames from, and others.

Having multiple trees that we may follow renames from led to lots of
bugs, and turned out to be unnecessary.

Split file_ids_from to give a single tree that will be authoritative,
and a list of others that we will take file ids from, but only if we would
otherwise generate one.

476. By James Westby on 2010-09-09

Avoid duplicate file ids in the import code with renames.

Don't crash when doing merge-upstream with a branch that does a rename
and then ships another file with the old path in the tarball that isn't
in the branch.

We would assign the same id to both paths, which obviously doesn't work.

Instead we now do a first pass to determine which file ids in the tree
will be assigned to different paths, and then avoid re-using that file
id with the old path.

475. By James Westby on 2010-08-20

Refactor cmd_merge_upstream in to smaller chunks.

474. By James Westby on 2010-08-19

Don't strip -n from the version we get in merge-upstream.

Some upstreams have a dash in there, and trying to support both means
supporting both badly. If you are used to doing

  bzr merge-upstream --version <package version>

then it will no longer work for you, use the upstream version instead.

Branch metadata

Branch format:
Branch format 7
Repository format:
Bazaar repository format 2a (needs bzr 1.16 or later)
Stacked on:
This branch contains Public information 
Everyone can see this information.