Comment 2 for bug 386544

Revision history for this message
Gioele Barabucci (gioele) wrote :

In fact the branch was compatible. Nevertheless I didn't want to overwrite.

May I suggest to add a warning along the lines of "You're about to overwrite the existing branch/repository '/path/FOO'. This is normal if you are doing an incremental import. Are you sure you want to continue?"

uncommit and revert would have not helped me: I interrupted bzr update with ^C (after seeing hundreds of "removing foo") so the branch (actually a standalone branch) was not in an usable state; at least it was not evident to me how to get back. The situation was aggravated by the presence of many unversioned (ignored) big files I was afraid to lose. For the records, I got out of this problem moving the dir away, making a branch from the push location and merging the unversioned files back into the new checkout with pax. With a little warning in place I would have probably avoided all these problems.