#17974 closed task (worksforme)

git tag issue of stem tree

Reported by: toralf Owned by: atagar
Priority: Medium Milestone:
Component: Core Tor/Stem Version:
Severity: Minor Keywords:
Cc: Actual Points:
Parent ID: Points:
Reviewer: Sponsor:

Description

This might be rather an issue related to the work flow than a real bug but I think it is worth to be reported.
At a stable Gentoo system I'm not able to apply the output of

git diff 1.4.1.. | (cd /var/tmp/portage/net-libs/stem-1.4.1/work/stem-1.4.1/; patch -p1 --dry-run)

onto an unpacked 1.4.1 Gentoo package. I get a problem here :

checking file stem/descriptor/microdescriptor.py
checking file stem/descriptor/networkstatus.py
Reversed (or previously applied) patch detected!  Assume -R? [n] n
Apply anyway? [n] n
Skipping patch.
12 out of 12 hunks ignored
checking file stem/descriptor/reader.py
checking file stem/descriptor/remote.py

However this works:

git diff 1.4.0.. | (cd /var/tmp/portage/net-libs/stem-1.4.0/work/stem-1.4.0/; patch -p1 --dry-run)

Which let me wonder, if I made a mistake here -or- the git tag 1.4.1 wasn't made at a merge point of the git tree ?

Child Tickets

Change History (6)

comment:1 Changed 23 months ago by toralf

FWIW: The back ground is: Under Gentoo it is easy to apply own patches onto a package, eg.:

$> git diff 1.4.0.. > /etc/portage/patches/net-libs/stem-1.4.0/stem-1.4.0-post.patch

followed by an

$> emerge stem

should made it usually.

comment:2 Changed 23 months ago by atagar

Not sure. When I made the 1.4.1 hotfix release I made a mistake and uploaded a tarball with 1.4.0 instead. I notified the packaging folks after fixing it which is why, for instance, Debian's package is 1.4.1b...

https://packages.debian.org/sid/python-stem

Not sure if that's at play here or not. I'd be a little surprised if after all this time Gentoo's 1.4.1 package didn't have the hotfix.

comment:3 Changed 23 months ago by toralf

I do have this here:

t44 stem # md5sum /var/tmp/distfiles/stem-1.4.*
d574b191c394dd698fb25d6402ba4777  /var/tmp/distfiles/stem-1.4.0.tar.bz2
e8196b16584796b2817613ca6ba3cbe4  /var/tmp/distfiles/stem-1.4.1.tar.bz2

FWIW

git diff 1.4.1.. | (cd /var/tmp/portage/net-libs/stem-1.4.1/work/stem-1.4.1/; patch -p1 --dry-run -f)

works so I still do wonder, if the tag should be better placed onto the merge commit id 9c0268a007c48b7ac4ad4c14950c3d976340f67c ?

Last edited 23 months ago by toralf (previous) (diff)

comment:4 Changed 23 months ago by atagar

I do have this here:

Hmmm, maybe it's then using the wrong one...

stem-1.4.0.tar.bz2: d574b191c394dd698fb25d6402ba4777
stem-1.4.1b.tar.bz2: 51d34dc013311afc8428c077b69712a0

I no longer have the old 1.4.1 tarball around to confirm that's what you have. Try applying the 1.4.0 diff to your 1.4.1 tarball and see if that works.

comment:5 Changed 23 months ago by toralf

The post-1.4.0 commits aa4e1bb and 1ee755feb where merged in 9c0268a0 with 1.4.1 as shown in

gitk 1.4.0..9c0268a0

So the easiest way here for me is to create a patch on top of 1.4.0 and apply that at my exit node.

Last edited 23 months ago by toralf (previous) (diff)

comment:6 Changed 23 months ago by toralf

Resolution: worksforme
Status: newclosed
Note: See TracTickets for help on using tickets.