Re: Help designing work flow

From: John Tapsell <johnflux@gmail.com>
Date: Mar 9, 2009, 13:22 UTC
Message-ID: <43d8ce650903090622j51b73801gb4be62a7f50029a4@mail.gmail.com>
In-Reply-To: <49B50B3C.50700@op5.se>

2009/3/9 Andreas Ericsson <ae@op5.se>:

> John Tapsell wrote:

> Not really. If bugs are in "unrelated" areas (if the topic changed some
> API without changing its' other callers, fe), you can backstep between
> each commit on the merged branch, remerge that commit (instead of the
> tip) and then run the tests again.

Doing that manually? Sounds really complicated, especially if the merge is nontrivial.

> But really, such bugs should have
> been detected prior to merging the branch, and in any case "git bisect"
> will find the commit that introduced the bug for you either way.

How will you detect bugs that arise from merging two trees, before you merge them?

> For next time, please cut away those parts of the email you didn't
> reply to. I had to scroll down to the bottom to make sure you hadn't
> written more.

I'll try sorry. Most email clients will hide the quoted text - there might be an option for that in your client?

John