~bzr-pqm/bzr/bzr.dev

From Revision 3948.1.1 to 3930

expand all

collapse all

Rev		Summary	Authors	Date	Diff	Files
3948.1.1		Fix an edge case with deleted files and criss-cross merges. Fix an edge case with deleted files and criss-cross merges. We wanted to be careful that if you had a criss-cross merge and both sides resolved the conflict in a different way, that you got a conflict. However, the original test was actually testing when one LCA dominated the other, which is a case where we shouldn't conflict. Test cases updated appropriately.	John Arbash Meinel	15 years ago
3948		Correct incorrect wording in revisionspec help (Matthew Full... Correct incorrect wording in revisionspec help (Matthew Fuller)	Canonical.com Patch ...	15 years ago
3947		Multi-glob rules (Marius Kruger) Multi-glob rules (Marius Kruger)	Canonical.com Patch ...	15 years ago
3946		(mbp) Fix strange default parameter to _sftp_readv (mbp) Fix strange default parameter to _sftp_readv	Canonical.com Patch ...	15 years ago
3945		(mbp) small refactorings of upgrade (mbp) small refactorings of upgrade	Canonical.com Patch ...	15 years ago
3944		apply jam's log --short fix (Ian Clatworthy) apply jam's log --short fix (Ian Clatworthy)	Canonical.com Patch ...	15 years ago
3943		Fix log --short/--line FILE (Ian Clatworthy, #317417) Fix log --short/--line FILE (Ian Clatworthy, #317417)	Canonical.com Patch ...	15 years ago
3942		(vila) Allows deltas to be filtered by log formatters (vila) Allows deltas to be filtered by log formatters	Canonical.com Patch ...	15 years ago
3941		(mbp) reorder things into the right part of NEWS (mbp) reorder things into the right part of NEWS	Canonical.com Patch ...	15 years ago
3940		(mbp) transport-based progress bars (mbp) transport-based progress bars	Canonical.com Patch ...	15 years ago
3939		init prints more concise information init prints more concise information	Canonical.com Patch ...	15 years ago
3938		Better/faster status after merge (Ian Clatworthy) Better/faster status after merge (Ian Clatworthy)	Canonical.com Patch ...	15 years ago
3937		(mbp) merge 1.11 and advance to 1.12 (mbp) merge 1.11 and advance to 1.12	Canonical.com Patch ...	15 years ago
3936		(jam) Update build-release for the 0.11rc1 release. (jam) Update build-release for the 0.11rc1 release.	Canonical.com Patch ...	15 years ago
3935		Add some EINTR-proofing to smart protocol socket code. (Andr... Add some EINTR-proofing to smart protocol socket code. (Andrew         Bennetts)	Canonical.com Patch ...	15 years ago
3934		(vila) Fix bug 315737 by correctly querying the test feature (vila) Fix bug 315737 by correctly querying the test feature	Canonical.com Patch ...	15 years ago
3933		(jam) Some fixes to stacked branches to avoid opening multip... (jam) Some fixes to stacked branches to avoid opening multiple         connections.	Canonical.com Patch ...	15 years ago
3932		Fix test_plugins so that it doesn't cause real plugins to be... Fix test_plugins so that it doesn't cause real plugins to be loaded.         (Andrew Bennetts)	Canonical.com Patch ...	15 years ago
3931		(Charles Duffy) Fix bug #314251 adding a file with a recentl... (Charles Duffy) Fix bug #314251 adding a file with a recently removed         file-id. should not break dirstate	Canonical.com Patch ...	15 years ago
3930		(jam) Flush the trace file during mutter() every 2s or so. (jam) Flush the trace file during mutter() every 2s or so.	Canonical.com Patch ...	15 years ago

• Older »

Loggerhead is a web-based interface for Breezy
Version: 2.0.1