~barry/bzr-builddeb/609186-urls : changes

~barry/bzr-builddeb/609186-urls » Changes from revision 483

From Revision 483 to 464

Rev	Summary	Authors	Tags	Date
483	Typo: forgot to return something ;) Typo: forgot to return something ;)	Barry Warsaw		13 years ago
482	LP: #609186 LP: #609186 Add ubuntu: u: debian: and d: schemes, along with distroseries support.	Barry Warsaw		13 years ago
481	Fix test fallout from having merge mode detection working. Fix test fallout from having merge mode detection working.	James Westby	2.6	13 years ago
480	Add a changelog entry for the test isolation fix. Add a changelog entry for the test isolation fix.	James Westby		13 years ago
479	Fix the auto-detection of merge mode. Thanks Jelmer. Fix the auto-detection of merge mode. Thanks Jelmer.	James Westby		13 years ago
478	Merge Jelmer's branch and credit him with the fix. Merge Jelmer's branch and credit him with the fix.	James Westby		13 years ago
477	Split file_ids_from in to one we should take renames from, a... 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.	James Westby		13 years ago
476	Avoid duplicate file ids in the import code with renames. 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.	James Westby		13 years ago
475	Refactor cmd_merge_upstream in to smaller chunks. Refactor cmd_merge_upstream in to smaller chunks.	James Westby		13 years ago
474	Don't strip -n from the version we get in merge-upstream. 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.	James Westby		13 years ago
473	Add changelog entries for the last couple of fixes. Add changelog entries for the last couple of fixes.	James Westby		13 years ago
472	Avoid an error on merge-upstream with an unrelated branch. T... Avoid an error on merge-upstream with an unrelated branch. Thanks Andrew.	James Westby		13 years ago
471	Avoid using UpstreamBranchSource if we don't know the upstre... Avoid using UpstreamBranchSource if we don't know the upstream branch in merge mode.	James Westby		13 years ago
470	Fix two more causes of debian_bundle deprecation warnings. Fix two more causes of debian_bundle deprecation warnings.	James Westby		13 years ago
469	Don't fail if asked to use a .bz2 tarball that is already in... Don't fail if asked to use a .bz2 tarball that is already in the desired location.	James Westby		13 years ago
468	Upload 2.5. Upload 2.5.	Jelmer Vernooij	2.5	13 years ago
467	Determine Bazaar home directory using bzrlib to prevent test... Determine Bazaar home directory using bzrlib to prevent test isolation issues.	James Westby		13 years ago
466	Fix doctest failures with newer python-debian. Thanks Jelmer... Fix doctest failures with newer python-debian. Thanks Jelmer.	James Westby		13 years ago
465	Try importing from debian first. Thanks Jelmer. Try importing from debian first. Thanks Jelmer.	James Westby		13 years ago
464	Fixed a logic error that stops -r working in merge-upstream. Fixed a logic error that stops -r working in merge-upstream.	James Westby		13 years ago

Older »