To get this branch, use:
bzr branch
http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
- Committer: Canonical.com Patch Queue Manager
- Date: 2007-07-21 16:36:03 UTC
- mfrom: (2644.1.2 bug-127115)
- Revision ID: pqm@pqm.ubuntu.com-20070721163603-p17kh2wgzkhbef1d
Fix bug #127115 by checking for self.other_rev_id being None in Merger.set_pending()
| Filename | Latest Rev | Last Changed | Committer | Comment | Size | ||
|---|---|---|---|---|---|---|---|
 ..
|
|||||||
__init__.py |
2553.2.10 | 18 years ago | Robert Collins | And overhaul WorkingTreeTestProviderAdapter too. | 4.8 KB |
|
|
|
test_compare.py |
2472.2.2 | 18 years ago | John Arbash Meinel | [merge] bugfix for bug #111288, resolve conflicts. | 62.3 KB |
|
|