Code review comment for lp:~novalis/inkscape/fix-167335

su_v (suv-lp) wrote :

I have no idea what has happened in your branch and why launchpad apparently does not create a preview diff anymore - trying to apply the diff from r12677 of your branch to local trunk checkout fails with a conflict:

> $ patch -p0 --dry-run < ../12677_12676.diff

> patching file src/sp-item-group.h
> Hunk #1 FAILED at 55.
> 1 out of 1 hunk FAILED -- saving rejects to file src/sp-item-group.h.rej

Trying to merge the branch into a local checkout of trunk fails with the same text conflict:

> $ bzr merge --preview lp:~novalis/inkscape/fix-167335
> Text conflict in src/sp-item-group.h

« Back to merge proposal