update performs two merges
Bug #113809 reported by
Ian Jackson
This bug affects 9 people
Affects | Status | Importance | Assigned to | Milestone | |
---|---|---|---|---|---|
Bazaar |
Fix Released
|
High
|
Gerard Krol |
Bug Description
update performing two merges can lead to hard to diagnose situations and this should be fixed - the current proposed fix is to merge once, and stop if there are errors, then do the second merge if required. I thought there was another bug open about this but cannot find it.
This can be reproduced by having a checkout with a local commit that modifies a file, and an uncommitted modification of that file, and then doing "bzr update". There's a shell script that demonstrates this at <https:/
Related branches
lp:~craighewetson-deactivatedaccount/bzr/update_with_local_commit
- John A Meinel: Needs Fixing
- Diff: 0 lines
lp:~gerard-/bzr/update
- Vincent Ladeuil: Approve
- John A Meinel: Approve
-
Diff: 312 lines (+180/-49)4 files modifiedNEWS (+4/-0)
bzrlib/tests/blackbox/test_commit.py (+7/-0)
bzrlib/tests/blackbox/test_update.py (+131/-8)
bzrlib/workingtree.py (+38/-41)
lp:~vila/bzr/integration
- Vincent Ladeuil: Approve
-
Diff: 31 lines (+4/-4)2 files modifiedbzrlib/lazy_regex.py (+3/-3)
doc/en/release-notes/bzr-2.7.txt (+1/-1)
description: | updated |
Changed in bzr: | |
importance: | Undecided → High |
status: | Unconfirmed → Confirmed |
description: | updated |
Changed in bzr: | |
assignee: | nobody → Gerard Krol (gerard-) |
status: | Confirmed → In Progress |
Changed in bzr: | |
milestone: | none → 2.2.0b1 |
status: | In Progress → Fix Released |
To post a comment you must log in.
I'm not sure what you are saying is the bug. Clearly you have been
confused.
In this case, if you had done 'bzr resolved debian/changelog' I expect
it would have addressed the conflicts immediately.
-Rob www.robertcolli ns.net/ keys.txt>.
--
GPG key available at: <http://