Enabling "Clean Copy" means all branch changes are associated with a build

[cygnl7]

Our build modifies some files that are source controlled. Those modifications can be undone on the next build, but by default the bzr-hudson plugin tries to merge those changes, and many times there are conflicts. (Incidentally, couldn't bzr-hudson just always revert to whatever is in its parent branch instead of trying to merge?)

In order to work around this issue we enabled the "Clean Copy" option. This is working wonderfully except for one thing. With the "Clean Copy" option enabled all changes for the given branch are associated with each build as opposed to just the changes since the last build.

Steps:
- Create a new job that uses bzr-hudson for its source control
- Click "Advanced" for advanced bzr-hudson options
- Check "Clean Copy" to enable it.
- Enter all other parameters as necessary
- Save the new job
- Check code in (including a commit message) to trigger a new build and wait for that build to finish
- Check more code in (including a second commit message) to trigger build #2

Result:
- Both commit messages show up in build #2's changes list

Expected:
- Only the commit message for the second commit should show up in build #2's changes list

[Guillermo Gonzalez (verterok)]

Hi,
Apologize the delay,
Thanks for reporting this.
I need to take a look, but should be fairly simple to fix.

Regards

[Craig Hewetson (craighewetson-deactivatedaccount)]

I've experienced conflicts on our build server at work. I'll try and reproduce it and log another bug (linked to this one) and implement a fix with a test case.

[Craig Hewetson (craighewetson-deactivatedaccount)]

bug for the conflicts problem and hopefully is fix:
https://bugs.launchpad.net/bzr-hudson/+bug/398446