Re: [Pan-users] Pan 0.99999999999999

[Rhialto]

On Thu 16 Jun 2011 at 06:21:50 -0500, Ron Johnson wrote:
> Somewhere in this month's list archives is mention of a git branch
> with binary uploads.

Speaking of git, did the repository at
git://github.com/lostcoder/pan2.git change history subtly at some point?

It happened multiple times now that I 'git pull'ed my original clone
from there, and it create weird merges and conflicts.

I made a new clone, and it is partly different...

For instance, when I pulled my original clone, it wanted to do some
merge, and the parent of that merge is this commit:

3b0ee7d66963a158149d21d1e582c1a1348ce1dc
Author: K. Haley <address@hidden>  2010-08-08 22:14:08
Committer: K. Haley <address@hidden>  2010-08-08 22:14:08
Parent: f8f3b038397d42b864d7f1dbf426a070a8ea380e (Merge branch 'filters')
Parent: 592421b9f12c2053f5cbf48abf49ff420c0838f4 (Minor updates to the regexes.)
Child:  2da956cc08feb7ce304de634cdab16ab36177cf4 (Merge branch 'master' of 
git://github.com/lostcoder/pan2)
Child:  4b2fd27af5d89718fa204c563ce76397212be074 (Change cast type for 
performance.)
Child:  bd015fea39afebf1dc0dbcfc72169c5f735f1bbc (remove depricated function 
through gtk 2.18)
Child:  a2323ba5dfe700589405b2b87e776a311da58382 (Teach text-massager about 
format=flowed.)
Child:  881d2c5e887bc88f5c552cdd5b6adac0a1dc4bea (update gitignore)
Branches: master, testing
Follows: 
Precedes: 

    Merge branch 'bug403797'

but that commit isn't present in the new clone! The closest in time and
commit message seems to be this one:

e3dab7ff90fe49d4df48108ba93d609b36a6e110
Author: K. Haley <address@hidden>  2010-08-08 22:13:59
Committer: K. Haley <address@hidden>  2010-08-08 22:13:59
Parent: 595eb83007ce6744b63df0a3951798fbf18a054d (Merge branch 'filters' into 
integration)
Parent: 592421b9f12c2053f5cbf48abf49ff420c0838f4 (Minor updates to the regexes.)
Child:  062349ad3dc09eed003b548136a3c731f5ea1858 (Merge branch 'xface' into 
integration)
Branches: master, remotes/origin/master, remotes/origin/next, 
remotes/origin/testing
Follows: 
Precedes: 

    Merge branch 'bug403797' into integration


I don't *think* I have done silly things with git to have caused this
myself, but one never knows. For instance, my "testing" tip was/is
nowhere near anything "remotes/origin/testing", it seems like a totally
different branch.

My old clone's "testing" tip is this:

2076ab1e0806484c4c8683bbcff8e514c1cc1b87
Author: K. Haley <address@hidden>  2011-02-12 09:15:52
Committer: K. Haley <address@hidden>  2011-02-12 09:15:52
Parent: 1f9facac9cf47e1b714a92b1862927608165162b (Make higlighting of URIs 
optional.)
Child:  0000000000000000000000000000000000000001 (Local changes checked in to 
index but not committed)
Branch: testing
Follows: 
Precedes: 

    another url update.

and the new clone seems to have an equivalent update that's somewhere in
the middle of its much longer history:

4512976efbca96a6127b8c88991dd39b5f10f1f7
Author: K. Haley <address@hidden>  2011-02-12 09:15:52
Committer: K. Haley <address@hidden>  2011-05-25 05:02:00
Parent: f1826d914865841f6da9a33ef5a5bbb093e65264 (Make higlighting of URIs 
optional.)
Child:  25ab4ab9a2c80cef072c4e986f4b308152e51f95 (Add a newsrc autosave timer.)
Branches: master, remotes/origin/master, remotes/origin/next, 
remotes/origin/testing
Follows: 
Precedes: 

    another url update.


Any ideas about what could have happened?

-Olaf.
-- 
___ Olaf 'Rhialto' Seibert  -- There's no point being grown-up if you 
\X/ rhialto/at/xs4all.nl    -- can't be childish sometimes. -The 4th Doctor