Comment 2 for bug 91725
Revision history for this message
| Andrew Lambe (alambe) wrote bzr normalize-history | #2 |
© 2004
Canonical Ltd.
•
Terms of use
•
Data privacy
•
Contact Launchpad Support
•
Blog
•
Careers
•
System status
•
1b1ed1a
(Get the code!)
I had this same issue and recently discussed it on the mailing list.
I vote for automatic re-normalization under these conditions.
Otherwise, I suggest having a "bzr normalize-history" command, which is essentially an alias for "bzr pull --overwrite ." and give a better error message such as:
Cannot commit changes to non-normalized branch history.
Versions of bzr prior to 0.15 may have left this condition.
To normalize the branch history use the command, bzr normalize-history