← Back to team overview

hipl-core team mailing list archive

Re: [Branch ~rene-hummen/hipl/ipsec_esp] Rev 4919: ...and the missing header addition


On Tue, Sep 07, 2010 at 08:48:53PM +0200, René Hummen wrote:
> On Sep 7, 2010, at 8:33 PM, Diego Biurrun wrote:
> > On Mon, Sep 06, 2010 at 05:10:41PM +0000, noreply@xxxxxxxxxxxxx wrote:
> >> message:
> >>  ...and the missing header addition
> > 
> > Note that Bazaar support uncommit quite nicely, so I think it's better
> > to use uncommit to fix such commits.  You can just uncommit and then
> > recommit a fixed version instead of adding a new revision to fix the
> > previous one.  In this way, you avoid having a broken and non-compiling
> > revision in between.
> Good point, although I don't like altering the history too much.
> It will always lead to confusion in case someone checked out the
> uncommitted commit in between. Nevertheless, I think for a project of
> our size and especially on an individual branch, this "history issue"
> should be of no concern.

This should hardly be a problem if you recommit quickly.  We hardly
average a handful of commits a week.  And you are right, if you are
working on a branch alone, there is no possibility for conflicts.
Also, the history will be cleaner if you decide to merge to trunk.