lp:~gagern/bzr/bug842695-log-dir

Branch merges

Propose for merging

No branches dependent on this one.

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #842695: log --include-merges apparently prints unrelated commits

Undecided

Confirmed

Link a bug report

Related blueprints

6130. By Martin von Gagern on 2011-09-10

Test case exposing bug #842695.

When restricting a log to a given directory, _generate_deltas will be sued
to find out matching revisions. It does so using
repository.get_deltas_for_revisions, which describes the difference that the
given revision introduced with respect to its left hand parent. So files
introduced by the right hand parent of a commit will be considered "added"
by the delta. This can lead to false positives, to commits reportedly
touching a given dir although they only merged stuff introducing these
files.

Note that for in some cases, this is expected behaviour: every merge on the
route from a modification to its first merge into mainline should be
considered touched by that modification. But for stuff already included in
main line, those modifications should not be reported again if they are
merged into some side line. In other words, every change should have one
direct child reporting it, but no more.

_generate_deltas apparently processes revisions in batches of 200. After
each batch, the found additions are removed from the fileid_set and won't be
tracked in the next batch. Processing terminates if there are no more files
to track. Due to this logic, a false positive in one batch can lead to
false negatives later on, as the file gets removed too early, and its actual
addition is therefore lost.

6129. By Patch Queue Manager <email address hidden> on 2011-09-09

(jelmer) Misc fixes for running the regular bzr tests against foreign
 branches. (Jelmer Vernooij)

6128. By Patch Queue Manager <email address hidden> on 2011-09-09

(vila) Properly decode command lines with embedded quotes for external merge
 tools. (Gordon Tyler)

6127. By Patch Queue Manager <pqm@cupuasso> on 2011-09-09

(jelmer) Fix some more tests when run against foreign bzr plugins. (Jelmer
 Vernooij)

6126. By Patch Queue Manager <pqm@cupuasso> on 2011-09-09

(vila) Document fix for #842993 in release notes. (Martin von Gagern)
 (Martin von Gagern)

6125. By Patch Queue Manager <pqm@cupuasso> on 2011-09-08

(jelmer) Allow orthogonal reconfiguration requests to coexist. (Martin von
 Gagern)

6124. By Patch Queue Manager <pqm@cupuasso> on 2011-09-08

(jelmer) Fix a typo (invalid format identifier) in an error message in
 bzrlib.gpg. (Jelmer Vernooij)

6123. By Canonical.com Patch Queue Manager <email address hidden> on 2011-09-02

(vila) Start supporting option expansion in config stacks. (Vincent Ladeuil)

6122. By Canonical.com Patch Queue Manager <email address hidden> on 2011-09-01

(jelmer) Various fixes to allow tests to run against foreign branches.
 (Jelmer Vernooij)

6121. By Canonical.com Patch Queue Manager <email address hidden> on 2011-09-01

(jelmer) bzr tag no longer errors if a tag exists but has the same target.
 (Jelmer Vernooij)