lp:~gerard-/bzr/update

Branch merges

Merged into lp:bzr

Vincent Ladeuil: Approve on 2010-02-10

John A Meinel: Approve on 2010-02-09

Diff: 312 lines (+180/-49)

4 files modified

NEWS (+4/-0)
bzrlib/tests/blackbox/test_commit.py (+7/-0)
bzrlib/tests/blackbox/test_update.py (+131/-8)
bzrlib/workingtree.py (+38/-41)

api

Propose for merging

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #113809: update performs two merges

High

Fix Released

Link a bug report

Related blueprints

5001. By Gerard Krol on 2010-02-06

NEWS item

5000. By Gerard Krol on 2010-02-06

Now correctly determine the branch point (instead of some lucky guesses)

4999. By Gerard Krol on 2010-02-06

Don't compare old_tip to revision, just do the merge.

4998. By Gerard Krol on 2010-02-06

Pass the new test by doing the first merge with self.basis_tree() as base

4997. By Gerard Krol on 2010-02-06

Test for a case where update should remove commits

4996. By Gerard Krol on 2010-02-06

No need to use "result +=" anymore

4995. By Gerard Krol on 2010-02-06

Reformat long lines

4994. By Gerard Krol on 2010-02-06

Use assertFileEqual in the tests, instead of opening them and looking at the contents. TODO: check if this does work on Windows (due to possible \r\n line endings)?

4993. By Gerard Krol on 2010-02-05

Remove an unused local variable that was still lingering

4992. By Gerard Krol on 2010-02-02

should pass all tests again