How to merge from upstream into an in-tree fork?

Asked by Krzysztof Kosinski

Inkscape uses a separate library called lib2geom for some computational geometry operations. This library is not API-stable yet, so although we keep it in a separate Launchpad project, the Inkscape tree has a fork of a subset of lib2geom's files. This way lib2geom can change API at will, but Inkscape remains buildable.

Is it possible to somehow merge the changes made in the "upstream" project (lib2geom) into the appropriate directory in Inkscape's project tree?

Question information

Language:
English Edit question
Status:
Answered
For:
Bazaar Edit question
Assignee:
No assignee Edit question
Last query:
Last reply:
Revision history for this message
Martin Pool (mbp) said :
#1
Revision history for this message
Vincent Ladeuil (vila) said :
#2

AFAIK, merge-into is broken, better do a 'merge, move merged files in the right subdir' dance.

This will make further merge from upstreams possible but pushing changes upstream will still be painful.

In the long term nested trees is the Right Thing.

Can you help with this problem?

Provide an answer of your own, or ask Krzysztof Kosinski for more information if necessary.

To post a message you must log in.