VinÃcius dos Santos Oliveira wrote
It looks like a bad approach. You should merge the commits, not discard one of them.
If you commit provides what the other commit provides too, then it's okay.
My sentence was a provocation to say that existing commits are not always good, sometimes you need to modify also what others have done to fit it with your work. Or do you think that you should never touch what others have written? If so you could only add code and it's pretty hard to correct bugs in this way... ;)
What I want to do is have the possibility of testing the interaction between my code and others' code before committing. What bzr does is make a mess, without advice, between others' code and mine and does not give me the opportunity to be able to distinguish my changes from others' changes after the update has been done, nor to have a preview of what would happen if you did an update.
And about discarding commits, it's not possible if the --append-only flag is specified. At most you can revert the changes and commit a new version: this has already happened in the Inkscape project. The old commit is still present in the project history and can be re-reverted, if necessary.
Luca
-- View this message in context: http://inkscape.13.x6.nabble.com/Help-with-bzr-tp4969689p4969727.html Sent from the Inkscape - Dev mailing list archive at Nabble.com.