bzr-hudson

Conflicts cause build to fail when doing a checkout

Bug #398446 reported by Craig Hewetson
6
This bug affects 1 person
Affects Status Importance Assigned to Milestone
bzr-hudson
Fix Released
Medium
Unassigned

Bug Description

When build process creates new unversioned files or modifies version control files, they are left as changes on the build server. Only to be picked up as conflicts again when a new build is started.

Propose that bzr-hudson clean's out the "unknown" files before updating (bzr update) and does a bzr revert after updating. to remove any conflicting files.

The bug:
https://bugs.launchpad.net/bzr-hudson/+bug/340638
Experiences this problem except it really requests a "fix" on the "Clean Copy" flag. There a separate bug is logged.

Craig Hewetson (craighewetson-deactivatedaccount)
Changed in bzr-hudson:
assignee: nobody → Craig Hewetson (craighewetson)
Revision history for this message
Guillermo Gonzalez (verterok) wrote :

Makes sense,
Also we could revert before updating (bzr revert && bzr update), but I'll let you to decide the approach ;)

Regards,

Changed in bzr-hudson:
importance: Undecided → Medium
status: New → Confirmed
Revision history for this message
Craig Hewetson (craighewetson-deactivatedaccount) wrote : Re: [Bug 398446] Re: Conflicts cause build to fail when doing a checkout

Initially I thought about doing this, but for some reason didn't take that
path.
But I think reverting first will be a better approach. (No exceptions on
update if conflicts exist.)

Thanks for the comment, will work on it ASAP.

NOTE:
These fixes depend on and update to bzr-java-lib found in:
lp:~craighewetson/bzr-java-lib/dev

Revision history for this message
Craig Hewetson (craighewetson-deactivatedaccount) wrote :

Another merge is needed. I've made the change you propsed, its a better solution, no exception logged on update.
Thanks

Changed in bzr-hudson:
status: Confirmed → Fix Committed
Guillermo Gonzalez (verterok)
Changed in bzr-hudson:
status: Fix Committed → Fix Released
To post a comment you must log in.
This report contains Public information  
Everyone can see this information.
Subscribing...

Other bug subscribers

Remote bug watches

Bug watches keep track of this bug in other bug trackers.