up-thread should require --force if there are uncommitted changes / commit locally first

Bug #227339 reported by John A Meinel on 2008-05-06
8
This bug affects 1 person
Affects Status Importance Assigned to Milestone
Loom
Wishlist
Unassigned

Bug Description

When doing "up-thread" it often has to merge the current branch tip into the next thread. If you have uncommitted changes at that time, then your committed changes get mingled with your uncommitted changes.

What would be nice, is if it detected that you will need to do a merge, and then check that the WT is clean. Sort of how "bzr merge" will refuse if you have uncommitted changes (unless you supply --force).

If 'up-thread' isn't going to create a new merge revision (because the current thread is already merged), then it could skip the WT check, since it knows that it won't co-mingle changes.

John A Meinel (jameinel) wrote :

see also bug #227349 which is more about getting conflicts with uncommitted changes

Robert Collins (lifeless) wrote :

If it committed locally first it might fit well in the 'up-thread automatically does magic' space.

summary: - up-thread should refuse if it would co-mingle changes
+ up-thread should require --force if there are uncommitted changes /
+ commit locally first
Changed in bzr-loom:
status: New → Confirmed
importance: Undecided → Wishlist
To post a comment you must log in.
This report contains Public information  Edit
Everyone can see this information.

Other bug subscribers