Merge lp:~mbp/bzr/484558-merge-directory into lp:bzr
Proposed by
Martin Pool
Status: | Work in progress |
---|---|
Proposed branch: | lp:~mbp/bzr/484558-merge-directory |
Merge into: | lp:bzr |
Diff against target: |
132 lines (+27/-34) (has conflicts) 4 files modified
NEWS (+10/-0) bzrlib/bundle/__init__.py (+17/-5) bzrlib/tests/test_http.py (+0/-8) bzrlib/tests/test_read_bundle.py (+0/-21) Text conflict in NEWS Text conflict in bzrlib/bundle/__init__.py |
To merge this branch: | bzr merge lp:~mbp/bzr/484558-merge-directory |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
John A Meinel | Approve | ||
Review via email: mp+22430@code.launchpad.net |
Description of the change
According to https:/
To post a comment you must log in.
Unmerged revisions
- 4964. By Martin Pool
-
Check first whether a bundle location is a directory
- 4963. By Martin Pool
-
Remove tests for read_bundle_
from_url - 4962. By Martin Pool
-
Delete deprecated read_bundle_
from_url
On Tue, Mar 30, 2010 at 2:00 AM, Martin Pool <email address hidden> wrote: decorators` `. bundle_ from_url` `
[snip]
> +<<<<<<< TREE
> * Added ``cachedproperty`` decorator to ``bzrlib.
> (Andrew Bennetts)
>
> +=======
> +* Delete deprecated function ``read_
> + (Martin Pool)
> +
> +>>>>>>> MERGE-SOURCE
It looks like conflict markers snuck in there.
> * Many test features were renamed from ``FooFeature`` to ``foo_feature`` bundle/ __init_ _.py' bundle/ __init_ _.py 2010-02-17 17:11:16 +0000 bundle/ __init_ _.py 2010-03-30 06:00:48 +0000
> to be consistent with instances being lower case and classes being
> CamelCase. For the features that were more likely to be used, we added a
>
> === modified file 'bzrlib/
> --- bzrlib/
> +++ bzrlib/
> @@ -1,4 +1,8 @@
> +<<<<<<< TREE
> # Copyright (C) 2005-2010 Canonical Ltd
> +=======
> +# Copyright (C) 2005, 2006, 2010 Canonical Ltd
> +>>>>>>> MERGE-SOURCE
And here too. Although, is that right? How'd did it go from
2005-2010 to 2005, 2006, 2010?
-John