| GyrosGeier | hi | 18:18 |
|---|---|---|
| GyrosGeier | I have an automated build using Jenkins, where I use bzr merge to add a stack of patches from a separate branch | 18:19 |
| GyrosGeier | I have to back these out before updating the tree, or I get conflicts in a way that Jenkins notices | 18:20 |
| GyrosGeier | currently, I do | 18:20 |
| GyrosGeier | $ bzr clean-tree --quiet --ignored --unknown --detritus --force | 18:20 |
| GyrosGeier | $ bzr pull --overwrite ... | 18:20 |
| GyrosGeier | $ bzr revert | 18:20 |
| GyrosGeier | and then merge my branch again | 18:21 |
| GyrosGeier | is there a way to do the same without cleaning the tree? | 18:21 |
| GyrosGeier | in a way that still works if files are added or removed in the merged branch | 18:22 |
| GyrosGeier | new files from the merged branch get left behind otherwise, and the second time the branch is merged, the merge fails | 18:23 |
| GyrosGeier | oh wait | 18:25 |
| GyrosGeier | another clean-tree after the revert | 18:25 |
| GyrosGeier | to make it actually work | 18:25 |
| GyrosGeier | is there a "merge --overwrite" or similar? | 18:27 |
| GyrosGeier | i.e. if the merge adds a file, that takes precedence over workspace files | 18:27 |
| GyrosGeier | example log of a build: http://ci.kicad-pcb.org/job/windows-kicad-msvc-head/cpu=x86,label=windows/979/consoleText | 18:29 |
| GyrosGeier | the merged branch changed, as it was rebased, and a file changed in both sides | 18:29 |
Generated by irclog2html.py 2.7 by Marius Gedminas - find it at mg.pov.lt!