[Pkg-ime-devel] ibus-chewing_1.4.7-2_amd64.changes REJECTED -> source?
Osamu Aoki
osamu_aoki_home at nifty.com
Sat Jan 25 06:45:37 UTC 2014
Hi,
On Sat, Jan 25, 2014 at 10:55:08AM +0800, ChangZhuo Chen (陳昌倬) wrote:
> On Sat, Jan 25, 2014 at 10:42:20AM +0900, Osamu Aoki wrote:
> > Hi,
> > You are not updating the pristine-tar. So I do not know what exactly
> > you used to make your local package. git-import-orig with --pristine-tar
> > should have created it. (Of course, we can get it into usable state
> > using pristine-tar command).
>
> Sorry, I did not notice the pristine-tar branch. I just use
> "git-import-orig" to import the original tarball into upstream branch
> before.
OK.
> It looks like I just need to use "git-import-orig --pristine-tar"
> instead to create pristine-tar
Yes, so far.
> and upstream branch. And then just work
> on master branch as before, right?
Not exactly ... since it did not work last time.
$ git-import-orig --pristine-tar ../?????????_?????.orig.tar.gz
this can be
$ git-import-orig --pristine-tar --uscan
And work on master as:
$ git checkout master
$ git merge upstream/?????
$ ...
You have to merge recently imported upstream/????? tag into master.
Wait a moment. Did you really used git-import-orig? It should merge
for you as I understand. It looks like you simply imported source to
upstream branch using "git add -A ." + "git checkin".
Have you used "gitk --all" to inspect how things work? That should make
situation clear when working with git.
Regards,
Osamu
More information about the Pkg-ime-devel
mailing list