Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.debian.maint.java > #10485

Re: Help to upgrade icedtea-web

Show all headers | View raw

[Multipart message — attachments visible in raw view] - view raw

Thanks a lot!
After reading some documentation I forked the repo and did the following:

git clone git@salsa.debian.org:don-vip-guest/icedtea-web.git
cd icedtea-web
git checkout origin/upstream -b upstream
git checkout origin/pristine-tar -b pristine-tar
git checkout master
gbp import-orig --uscan --pristine-tar
git push --all

then created three Merge Requests (one per branch) in this order: upstream,
pristine-tar, master:
https://salsa.debian.org/java-team/icedtea-web/merge_requests

The first two seem to be correct, but the third (master) has merge
conflicts, I don't understand why? I probably did something wrong.

Vincent

2018-05-04 18:16 GMT+02:00 Emmanuel Bourg <ebourg@apache.org>:

> Le 03/05/2018 à 23:43, Vincent Privat a écrit :
>
> > I am interested in upgrading icedtea-web to fix #886109 and #894360.
> > My first question: Is the VCS up-to-date? There's a vcswatch warning
> > about that. The changelog I find in Bazaar stops at 1.6.2-1 while the
> > current package version is 1.6.2-3.1:
> > https://qa.debian.org/cgi-bin/vcswatch?package=icedtea-web
>
> I've migrated the Bazaar repository to Git and imported the missing
> updates, you are ready to go:
>
>   https://salsa.debian.org/java-team/icedtea-web
>
> Emmanuel Bourg
>

Back to linux.debian.maint.java | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

Help to upgrade icedtea-web Vincent Privat <vincent@josm.openstreetmap.de> - 2018-05-03 23:50 +0200
  Re: Help to upgrade icedtea-web Emmanuel Bourg <ebourg@apache.org> - 2018-05-04 00:00 +0200
    Re: Help to upgrade icedtea-web Vincent Privat <vincent@josm.openstreetmap.de> - 2018-05-04 00:10 +0200
      Re: Help to upgrade icedtea-web Emmanuel Bourg <ebourg@apache.org> - 2018-05-04 00:30 +0200
  Re: Help to upgrade icedtea-web Emmanuel Bourg <ebourg@apache.org> - 2018-05-04 18:20 +0200
    Re: Help to upgrade icedtea-web Vincent Privat <vincent@josm.openstreetmap.de> - 2018-05-04 23:40 +0200
      Re: Help to upgrade icedtea-web Emmanuel Bourg <ebourg@apache.org> - 2018-05-08 00:20 +0200
        Re: Help to upgrade icedtea-web Vincent Privat <vincent.privat@gmail.com> - 2018-05-08 00:40 +0200
          Re: Help to upgrade icedtea-web Vincent Privat <vincent.privat@gmail.com> - 2018-05-08 01:00 +0200
            Re: Help to upgrade icedtea-web Vincent Privat <vincent.privat@gmail.com> - 2018-05-08 13:40 +0200
              Re: Help to upgrade icedtea-web Vincent Privat <vincent.privat@gmail.com> - 2018-05-21 19:00 +0200
      Re: Help to upgrade icedtea-web Vincent Privat <vincent@josm.openstreetmap.de> - 2018-05-08 00:20 +0200

csiph-web