Bazaar

lp:~vila/bzr/306879-show-base-revid

Created by Vincent Ladeuil and last modified
Get this branch:
bzr branch lp:~vila/bzr/306879-show-base-revid
Only Vincent Ladeuil can upload to this branch. If you are Vincent Ladeuil please log in for upload directions.

Branch merges

Related bugs

Related blueprints

Branch information

Owner:
Vincent Ladeuil
Project:
Bazaar
Status:
Development

Recent revisions

3910. By Vincent Ladeuil

Add NEWS entry.

3909. By Vincent Ladeuil

Fix #306879 by mentioning the base revision id in the 'BASE' conflict marker lines.

* bzrlib/tests/blackbox/test_merge.py:
(TestMerge.test_merge_override_show_base): Update test.

* bzrlib/merge.py:
(Merge3Merger.text_merge.iter_merge3): Add the revid when
show-base is used.

3908. By Canonical.com Patch Queue Manager <email address hidden>

(Jelmer) Remove unnecessary commands in svn guide.

3907. By Canonical.com Patch Queue Manager <email address hidden>

(Jari Aalto) Unify some examples to be consistent with the rest of
 the documentation.

3906. By Canonical.com Patch Queue Manager <email address hidden>

(Jelmer) bzr-svn releases are now in lp:bzr-svn again.

3905. By Canonical.com Patch Queue Manager <email address hidden>

Improved help on storage formats (Ian Clatworthy)

3904. By Canonical.com Patch Queue Manager <email address hidden>

shelf uses paths relative to current directory (abentley)

3903. By Canonical.com Patch Queue Manager <email address hidden>

(vila) Fix redirection related bugs: #245964, #265070,
 #270863 and #303959

3902. By Canonical.com Patch Queue Manager <email address hidden>

(vila) Use the short status format when the short format is used for
 log

3901. By Canonical.com Patch Queue Manager <email address hidden>

Add more tests for dotted revnos. (Marius Kruger)

Branch metadata

Branch format:
Branch format 6
Repository format:
Bazaar pack repository format 1 (needs bzr 0.92)
This branch contains Public information 
Everyone can see this information.

Subscribers