Hi Matej,
On Fri, Apr 11, 2008 at 08:32:05PM +0200, Matej Vela wrote:
[..snip..]
> -- I get two disjointed branches:
>
> o---o---o <-- upstream
> \
> o---o---o <-- master
This is the only sane thing we can do, since we can't be sure upstream has
merge conflicts with master (if you do any changes outside debian/) and
the merge would fail. It's basically the reverse of what you describe
below.
> The next time git-import-orig imports a new version, say 2.3.5, git will
> think master is based on 2.3.1 (when in fact it is 2.3.4). It will try
> to merge in changes between 2.3.1 and 2.3.4 that are already applied in
> master, and the merge will usually fail.
This can be avoided if you do a "final" merge after importing all the
dsc's. Git will figure out what to do then. The overhead of this is
neglible to the potential merge conflicts when doing the merge every
time. So after importing all the dscs simply do:
git-checkout master
git-merge upstream
giving:
o---o---o---o <-- upstream
\ \
o---o---o---o <-- master
and the the next git-import-orig should work as expected.
Hope this helps,
-- Guido
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
