Comment 7 for bug 355964
Revision history for this message
| Andrew Bennetts (spiv) wrote Re: [Bug 355964] Re: bzr switch has moved one of my files to .THIS and wants to add it to the branch | #7 |
© 2004
Canonical Ltd.
•
Terms of use
•
Data privacy
•
Contact Launchpad Support
•
Blog
•
Careers
•
System status
•
0e1f616
(Get the code!)
> However, I think the directory did in fact have uncommited changes
> (although I didn't intend this, I just forgot to run "bzr st" before
> "bzr switch"). I'd have preferred switch refuse to run than have this
> happen though.
It is a feature that switch will work when there are uncommitted changes.
The uncommitted changes will be preserved in the resulting working tree.
I've personally found this useful, not merely thought it sounded like a neat
idea :)
What sucks is if there are conflicts then you end up with a mess that is
hard to undo. i.e. the sequence of "bzr switch foo" / oops I didn't want to
switch yet / "bzr switch old" is intuitive and fine when there are no
conflicts. So perhaps a good feature would be if "bzr switch" first checked
there will be no conflicts before actually changing the tree, with a --force
to override?
Or I guess a reliable way to undo bad switch/merge/update would do, i.e. get
back the original tree with the same uncommitted changes as before the
merge, with no conflict markers or other noise. In theory all the necessary
information should be there.