Git versus Bzr what is going on with emacs-24 branch?

Git versus Bzr what is going on with emacs-24 branch?

[Vitalie Spinu]

Hi, 

I have just updated git remote refs, and found that emacs-24 is 6 months
old

   2012-07-12 09:12 Andreas Schwab     o [emacs-24] [origin/emacs-24] Fixes: debbugs:11917

Checked savanah web source browser: http://git.savannah.gnu.org/cgit/emacs.git
It says the same thing. Bzr is ok: http://bzr.savannah.gnu.org/lh/emacs/

What is going on? Is this normal? And if so, how should I adjust my
local branches?

    Thanks, 
    Vitalie

Re: Git versus Bzr what is going on with emacs-24 branch?

[Vitalie Spinu]

  >> Vitalie Spinu <spinuvit@gmail.com>
  >> on Thu, 27 Dec 2012 10:00:51 +0100 wrote:

  VS> Hi, 

  VS> I have just updated git remote refs, and found that emacs-24 is 6 months
  VS> old

  VS>    2012-07-12 09:12 Andreas Schwab     o [emacs-24] [origin/emacs-24] Fixes: debbugs:11917

  VS> Checked savanah web source browser: http://git.savannah.gnu.org/cgit/emacs.gitIt says the same thing. Bzr is ok: http://bzr.savannah.gnu.org/lh/emacs/

  VS> What is going on? Is this normal? And if so, how should I adjust my
  VS> local branches?

Ok, it's not only emacs-24 it's the whole git mirror. A savannah holiday
glitch, I assume.

    Vitalie

Re: Git versus Bzr what is going on with emacs-24 branch?

[Xue Fuqiao]

On Thu, 27 Dec 2012 10:16:29 +0100
Vitalie Spinu <spinuvit@gmail.com> wrote:

> A savannah holiday glitch, I assume.

I think so, too.
-- 
Best regards, Xue Fuqiao.
http://www.emacswiki.org/emacs/XueFuqiao

Re: Git versus Bzr what is going on with emacs-24 branch?

[Adam Sjøgren]

On Thu, 27 Dec 2012 10:16:29 +0100, Vitalie wrote:

> Ok, it's not only emacs-24 it's the whole git mirror. A savannah holiday
> glitch, I assume.

The repo.or.cz mirror doesn't seem to exhibit the same problem, in the
meantime:

 * http://repo.or.cz/w/emacs.git


  Best regards,

    Adam

-- 
 "You miss too much these days if you stop to think"          Adam Sjøgren
                                                         asjo@koldfront.dk

Re: Git versus Bzr what is going on with emacs-24 branch?

[John Wiegley]

>>>>> Adam Sjøgren <asjo@koldfront.dk> writes:

> The repo.or.cz mirror doesn't seem to exhibit the same problem, in the
> meantime:

>  * http://repo.or.cz/w/emacs.git

I was running the Bzr->Git mirror on my old server, it looks like maybe
something happened and it died.  I've since moved to another server, and
haven't restored the mirror process on that server, so I recommend using the
link above if it's up to date.

John

Re: Git versus Bzr what is going on with emacs-24 branch?

[Óscar Fuentes]

"John Wiegley" <johnw@newartisans.com> writes:

> I was running the Bzr->Git mirror on my old server, it looks like maybe
> something happened and it died.  I've since moved to another server, and
> haven't restored the mirror process on that server, so I recommend using the
> link above if it's up to date.

Do you plan to continue mirroring the Emacs repo in the future?

Re: Git versus Bzr what is going on with emacs-24 branch?

[John Wiegley]

>>>>> Óscar Fuentes <ofv@wanadoo.es> writes:

> "John Wiegley" <johnw@newartisans.com> writes:
>> I was running the Bzr->Git mirror on my old server, it looks like maybe
>> something happened and it died.  I've since moved to another server, and
>> haven't restored the mirror process on that server, so I recommend using
>> the link above if it's up to date.

> Do you plan to continue mirroring the Emacs repo in the future?

No, I lack the time to keep it running.  I'd be happy to hand over the process
to anyone else who wishes to keep it going.

John

Re: Git versus Bzr what is going on with emacs-24 branch?

[Óscar Fuentes]

"John Wiegley" <johnw@newartisans.com> writes:

>> Do you plan to continue mirroring the Emacs repo in the future?
>
> No, I lack the time to keep it running.  I'd be happy to hand over the process
> to anyone else who wishes to keep it going.

I don't have a server for publising the mirror (nor possibly the cpu
resources for synching on a regular basis) but if you publish your scripts,
I would use them for keeping a private mirror.

Re: Git versus Bzr what is going on with emacs-24 branch?

[Stefan Monnier]

>>> Do you plan to continue mirroring the Emacs repo in the future?
>> No, I lack the time to keep it running.  I'd be happy to hand over
>> the process to anyone else who wishes to keep it going.
> I don't have a server for publising the mirror

There's no need for another server publishing the mirror: git.sv.gnu.org
does the job just fine.  The problem is to keep it uptodate.


        Stefan

Re: Git versus Bzr what is going on with emacs-24 branch?

[Glenn Morris]

Stefan Monnier wrote:

> There's no need for another server publishing the mirror: git.sv.gnu.org
> does the job just fine.  The problem is to keep it uptodate.

But it obviously is being updated, so I'm not sure what the point of
this discussion is. Just look at it:

http://git.savannah.gnu.org/cgit/emacs.git

Re: Git versus Bzr what is going on with emacs-24 branch?

[Óscar Fuentes]

Glenn Morris <rgm@gnu.org> writes:

> Stefan Monnier wrote:
>
>> There's no need for another server publishing the mirror: git.sv.gnu.org
>> does the job just fine.  The problem is to keep it uptodate.
>
> But it obviously is being updated, so I'm not sure what the point of
> this discussion is. Just look at it:
>
> http://git.savannah.gnu.org/cgit/emacs.git

The emacs git mirror at repo.or.cz is being updated too (actually, I
suspect that git.savannah.gnu.org is mirroring repo.or.cz, or vice
versa) but in the past the mirroring routine stopped for months and
there is no guarantee that it won't happen again. So I'll like to stop
depending on third parties and do the mirroring myself. Hence if anyone
wishes to share his recipe(*), I'll be grateful.

(*) IIRC, doing the job on a reasonably efficient and correct way is
non-trivial.

Re: Git versus Bzr what is going on with emacs-24 branch?

[Andreas Schwab]

This is the script I'm using.

Andreas.

#!/bin/bash
test last-sync-start -nt last-sync-ready || touch -r last-sync-start last-sync
touch last-sync-start
rsync -av --del --exclude=obsolete_packs bzr.sv.gnu.org::bzr/emacs/ emacs.bzr/ || exit
old=$(wc -l < marks/git-marks)
cd emacs.git
git fetch
state=$(git show-ref)
cd ../emacs.bzr
heads=
while read r; do
  b=${r%/.bzr/*}
  bb=$b
  test $b = master && bb=bzr/master
  test $b = emacs-23/emacs-23.2 && continue
  heads+=" refs/heads/$bb"
  git --git-dir=../emacs.git show-ref -q --verify refs/heads/$bb &&
  test $r -ot ../last-sync && continue
  echo $b
  bzr fast-export --plain --marks=../marks/bzr-marks -b $bb $b | (
    cd ../emacs.git
    git fast-import --force --quiet --export-marks=../marks/git-marks --import-marks=../marks/git-marks
  )
done < <(find . -path "*/.bzr/branch/last-revision" -printf "%P\n" | sort)
touch ../last-sync-ready
cd ../emacs.git
git show-ref --heads |
while read rev head; do
  test $head = refs/heads/master && continue
  case " $heads " in
    *" $head "*)
      r=$(echo "$state" | awk -v head=$head '$2 == head { print $1 }')
      if test -n "$r" && test "$(git merge-base $r $head)" != $r; then
	git tag lost+found/$r $r
      fi
      ;;
    *)
      git update-ref -d $head
      if test -z "$(git branch --contains $rev)"; then
	git tag lost+found/$rev $rev
      fi
      ;;
  esac
done

-- 
Andreas Schwab, schwab@linux-m68k.org
GPG Key fingerprint = 58CA 54C7 6D53 942B 1756  01D3 44D5 214B 8276 4ED5
"And now for something completely different."

Re: Git versus Bzr what is going on with emacs-24 branch?

[Xue Fuqiao]

On Sat, 09 Feb 2013 14:02:19 +0100
Andreas Schwab <schwab@linux-m68k.org> wrote:

> This is the script I'm using.

Looks good.  Thanks for your sharing.

-- 
Best regards, Xue Fuqiao.
http://www.emacswiki.org/emacs/XueFuqiao