DJabberd now lives on git and github

Alex Vandiver alexmv at bestpractical.com
Tue May 25 00:19:49 UTC 2010


On Mon, 2010-05-24 at 17:08 -0700, Yann Kerherve wrote:
> Are they, really?

Yes.

> If you take r4 for instance
> 
> git blame doc/rfc3920-notes.txt |head -1
> ^486f141 rfc3920-notes.txt (Brad Fitzpatrick  2006-03-01 17:12:05 +0000    1)

...I get a different SHA for this:
$ git blame doc/rfc3920-notes.txt | head -1
^88db1e6 rfc3920-notes.txt (Brad Fitzpatrick  2006-03-01 17:12:05 +0000    1) 

> git show 486f141 | grep trunk
>     git-svn-id: http://code.sixapart.com/svn/djabberd/trunk@4
> 43dd9337-660f-0410-bd32-e7601923a1a1
> 
> so it's still "there" though git log might not show you it without the
> right options

r4 changed:

$ svn diff -c4 http://code.sart.com/svn/djabberd | diffstat
 doc/rfc3920-notes.txt | 5043 ++++++++++++++++++++++++++++++++++++++++++
 doc/rfc3920.txt       | 5043 ++++++++++++++++++++++++++++++++++++++++++
 doc/rfc3921.txt       | 5995 ++++++++++++++++++++++++++++++++++++++++++++++++++
 lib/DJabberd.pm       |   63 
 4 files changed, 16129 insertions(+), 15 deletions(-)

...however, 88db1e6 is only the doc/ portion of that:

$ git show 88db1e6 | diffstat
 rfc3920-notes.txt | 5043 +++++++++++++++++++++++++++++++++++++++++++++
 rfc3920.txt       | 5043 +++++++++++++++++++++++++++++++++++++++++++++
 rfc3921.txt       | 5995 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 16081 insertions(+)

The lib/DJabberd.pm change isn't in that commit, or any other commit.
r4 is perhaps a bad example, as it touched things outside of lib/, which
is confusing matters.  Can you show ma a commit that contains r3?
 - Alex



More information about the Djabberd mailing list