lp:~gagern/bzr/bug842575-rm-resolve

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 #842575: Missing file reported after resolved removal conflict

High

Confirmed

Link a bug report

Related blueprints

6133. By Martin von Gagern on 2011-09-07

Catch one more detail in #842575 test case.

I found out that recreating the file will list it as added instead of
missing, despite the ignore. So I've rearranged the tests so that the
ignore and the --take-other (which preserves the base name) are now in the
same test, and ensure that adding the file again will cause no output at
all.

6132. By Martin von Gagern on 2011-09-06

Introduce more difference in test cases.

Now one of the test cases has the "bzr ignore" back, while the other uses a
lightweight checkout. By distributing these diffrences over the two test
cases, we avoid having to check every combination and should still catch any
issues caused by one of these differences by itself.

6131. By Martin von Gagern on 2011-09-06

Drop ignore command, as it is not required to reproduce this.

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

Added blackbox test scripts exposing bug lp:842575.

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

(jam) Merge 2.4 into trunk, including bugs #825027 and #837293

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

(jelmer) Allow tag implementations to not support ghost revisions. (Jelmer
 Vernooij)

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

(gz) Fix breakage when creating a transport at drive root on windows (Martin
 [gz])

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

(vila) Cleanup http imports (Jelmer Vernooij)

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

(jelmer) Mention the number of tags that was pushed/pull,
 if any. (Jelmer Vernooij)

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

(jelmer) Add a ``bugtracker`` configuration option. (Jelmer Vernooij)