"bzr merge" always looks at revision graph
Bug #741760 reported by
Jelmer Vernooij
This bug affects 1 person
| Affects | Status | Importance | Assigned to | Milestone | |
|---|---|---|---|---|---|
| Bazaar |
Fix Released
|
Critical
|
Jelmer Vernooij | ||
| Bazaar Git Plugin |
Fix Released
|
Critical
|
Jelmer Vernooij | ||
| Bazaar Hg Plugin |
Fix Released
|
Critical
|
Jelmer Vernooij | ||
| Bazaar Subversion Plugin |
Fix Released
|
High
|
Jelmer Vernooij | ||
Bug Description
bzr merge uses the same approach as "ControlDir.sprout" to fetch branch tips and tags; this involves looking at the source repository's revision graph which is not possible with some foreign formats and slow with others.
Related branches
lp:~jelmer/bzr/move-interbranch-fetch2
- John A Meinel: Pending requested
- Andrew Bennetts: Pending requested
-
Diff: 223 lines (+22/-61)5 files modifiedbzrlib/branch.py (+18/-45)
bzrlib/merge.py (+1/-8)
bzrlib/tests/test_revisionspec.py (+2/-4)
bzrlib/workingtree_4.py (+1/-1)
doc/en/release-notes/bzr-2.4.txt (+0/-3)
lp:~jelmer/bzr-git/merge-fetch
- bzr-git developers: Pending requested
-
Diff: 52 lines (+14/-4)2 files modifiedNEWS (+3/-0)
branch.py (+11/-4)
lp:~jelmer/bzr-svn/merge-fetch
- bzr-svn developers: Pending requested
- Diff: 0 lines
lp:~jelmer/bzr-hg/merge-fetch
- bzr-hg developers: Pending requested
| Changed in bzr-svn: | |
| status: | Expired → Confirmed |
| status: | Confirmed → Triaged |
| Changed in bzr-hg: | |
| status: | New → Triaged |
| Changed in bzr-git: | |
| status: | New → Triaged |
| Changed in bzr-hg: | |
| importance: | Undecided → Critical |
| Changed in bzr-git: | |
| importance: | Undecided → Critical |
| Changed in bzr: | |
| importance: | Undecided → Critical |
| status: | New → Triaged |
| milestone: | none → 2.4b2 |
| Changed in bzr-git: | |
| milestone: | none → 0.6.0 |
| Changed in bzr-svn: | |
| milestone: | none → 1.1.0 |
| Changed in bzr-hg: | |
| milestone: | none → 0.2 |
| Changed in bzr: | |
| assignee: | nobody → Jelmer Vernooij (jelmer) |
| Changed in bzr-git: | |
| assignee: | nobody → Jelmer Vernooij (jelmer) |
| Changed in bzr-svn: | |
| assignee: | nobody → Jelmer Vernooij (jelmer) |
| Changed in bzr-hg: | |
| assignee: | nobody → Jelmer Vernooij (jelmer) |
| Changed in bzr-git: | |
| status: | Triaged → Fix Committed |
| Changed in bzr-svn: | |
| status: | Triaged → Fix Committed |
| Changed in bzr-hg: | |
| status: | Triaged → Fix Committed |
| Changed in bzr: | |
| status: | Triaged → In Progress |
| Changed in bzr-git: | |
| status: | Fix Committed → Fix Released |
| Changed in bzr: | |
| status: | In Progress → Fix Released |
| Changed in bzr-svn: | |
| status: | Fix Committed → Fix Released |
| Changed in bzr-hg: | |
| milestone: | 0.2 → 0.1.1 |
| status: | Fix Committed → Fix Released |
To post a comment you must log in.
