Re: [DebianGIS-dev] Mapnik repository

2009-11-11 Thread Dominic Hargreaves
On Tue, Nov 10, 2009 at 04:06:50PM +0100, David Paleino wrote:
 Please, git push --all, and let's see what can be done.

I've now done this to mapnik-old.git on alioth.

Cheers,
Dominic.

-- 
Dominic Hargreaves | http://www.larted.org.uk/~dom/
PGP key 5178E2A5 from the.earth.li (keyserver,web,email)

___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel


[DebianGIS-dev] Mapnik repository

2009-11-10 Thread David Paleino
Hello people,
sorry for the flood, but the mapnik repository did not have the appropriate 
layout and, while trying to fix it.. well. I screwed it up. So I had to 
create it twice.

The old repository, with full log, (the one created by the previous 
maintainer), is available on alioth:/git/pkg-grass/mapnik-old.git.

Sorry for the noise.

David

-- 
 . ''`.   Debian developer | http://wiki.debian.org/DavidPaleino
 : :'  : Linuxer #334216 --|-- http://www.hanskalabs.net/
 `. `'`  GPG: 1392B174 | http://snipr.com/qa_page
   `-   2BAB C625 4E66 E7B8 450A C3E1 E6AA 9017 1392 B174


___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel


Re: [DebianGIS-dev] Mapnik repository

2009-11-10 Thread Dominic Hargreaves
On Tue, Nov 10, 2009 at 10:09:17AM +0100, David Paleino wrote:
 Hello people,
 sorry for the flood, but the mapnik repository did not have the appropriate 
 layout and, while trying to fix it.. well. I screwed it up. So I had to 
 create it twice.
 
 The old repository, with full log, (the one created by the previous 
 maintainer), is available on alioth:/git/pkg-grass/mapnik-old.git.

Erm, can't you fix that with various git reset invocations?

It would have been nice if you'd given me some feedback on what you
think is appropriate.

-- 
Dominic Hargreaves | http://www.larted.org.uk/~dom/
PGP key 5178E2A5 from the.earth.li (keyserver,web,email)

___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel


Re: [DebianGIS-dev] Mapnik repository

2009-11-10 Thread Dominic Hargreaves
On Tue, Nov 10, 2009 at 12:39:57PM +, Dominic Hargreaves wrote:
 On Tue, Nov 10, 2009 at 10:09:17AM +0100, David Paleino wrote:
  Hello people,
  sorry for the flood, but the mapnik repository did not have the appropriate 
  layout and, while trying to fix it.. well. I screwed it up. So I had to 
  create it twice.
  
  The old repository, with full log, (the one created by the previous 
  maintainer), is available on alioth:/git/pkg-grass/mapnik-old.git.
 
 Erm, can't you fix that with various git reset invocations?
 
 It would have been nice if you'd given me some feedback on what you
 think is appropriate.

Or for that matter, start again from the known good respository that
you obviously have (mapnik-old.git).

-- 
Dominic Hargreaves | http://www.larted.org.uk/~dom/
PGP key 5178E2A5 from the.earth.li (keyserver,web,email)

___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel


Re: [DebianGIS-dev] Mapnik repository

2009-11-10 Thread David Paleino
Dominic Hargreaves wrote:

 On Tue, Nov 10, 2009 at 12:39:57PM +, Dominic Hargreaves wrote:
 On Tue, Nov 10, 2009 at 10:09:17AM +0100, David Paleino wrote:
  Hello people,
  sorry for the flood, but the mapnik repository did not have the
  appropriate layout and, while trying to fix it.. well. I screwed it up.
  So I had to create it twice.
  
  The old repository, with full log, (the one created by the previous
  maintainer), is available on alioth:/git/pkg-grass/mapnik-old.git.
 
 Erm, can't you fix that with various git reset invocations?
 
 It would have been nice if you'd given me some feedback on what you
 think is appropriate.

Uh, I don't think that's a problem. Git is easy because you can move 
directories out of the way, and you're done (i.e. your repo is still there, 
I haven't touched it at all)

What I mean is the git-buildpackage layout, i.e.

master # where Debian development happens, i.e. debian/
pristine-tar   # where pristine-tar deltas are stored
upstream   # where upstream sources are kept, to be merged in 
 master

This eases tracking upstream versions, and managing multiple uploads to 
Debian (let's say: sid (master), experimental, backports, [..] (all these in 
separate branches mimicking master and upstream)

 Or for that matter, start again from the known good respository that
 you obviously have (mapnik-old.git).

I don't think I easily can, but I should try.

Was mapnik-old.git (the one you pushed) generated/converted from some other 
repo? Or was it your main development repo?

Thank you for replying :)

Kindly,
David

-- 
 . ''`.   Debian developer | http://wiki.debian.org/DavidPaleino
 : :'  : Linuxer #334216 --|-- http://www.hanskalabs.net/
 `. `'`  GPG: 1392B174 | http://snipr.com/qa_page
   `-   2BAB C625 4E66 E7B8 450A C3E1 E6AA 9017 1392 B174


___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel


Re: [DebianGIS-dev] Mapnik repository

2009-11-10 Thread Dominic Hargreaves
On Tue, Nov 10, 2009 at 02:13:17PM +0100, David Paleino wrote:
 Dominic Hargreaves wrote:
 
  On Tue, Nov 10, 2009 at 12:39:57PM +, Dominic Hargreaves wrote:
  On Tue, Nov 10, 2009 at 10:09:17AM +0100, David Paleino wrote:
   Hello people,
   sorry for the flood, but the mapnik repository did not have the
   appropriate layout and, while trying to fix it.. well. I screwed it up.
   So I had to create it twice.
   
   The old repository, with full log, (the one created by the previous
   maintainer), is available on alioth:/git/pkg-grass/mapnik-old.git.
  
  Erm, can't you fix that with various git reset invocations?
  
  It would have been nice if you'd given me some feedback on what you
  think is appropriate.
 
 Uh, I don't think that's a problem. Git is easy because you can move 
 directories out of the way, and you're done (i.e. your repo is still there, 
 I haven't touched it at all)

I don't really follow this paragraph, sorry.

As far as I can tell you have lost the history in the main package
repository, which i a shame. I don't personally care since I probably
won't do any more development with the package (maybe I should actually
just remove my name completely from the package) but having that
history available was the reason I went to the effort of publishing
the git repo. Having to manually poke around in a random other repo
is just inconvenient.

 What I mean is the git-buildpackage layout, i.e.
 
 master # where Debian development happens, i.e. debian/
 pristine-tar   # where pristine-tar deltas are stored
 upstream   # where upstream sources are kept, to be merged in 
  master
 
 This eases tracking upstream versions, and managing multiple uploads to 
 Debian (let's say: sid (master), experimental, backports, [..] (all these in 
 separate branches mimicking master and upstream)

It looks like I might have neglected to push the upstream and
pristine-tar branches from my repo to git.debian.org. I can probably
still push them to the old repo if you want to try and reconstruct a
clean history.

  Or for that matter, start again from the known good respository that
  you obviously have (mapnik-old.git).
 
 I don't think I easily can, but I should try.
 
 Was mapnik-old.git (the one you pushed) generated/converted from some other 
 repo? Or was it your main development repo?

I created a repo from my private subversion repository by mostly
following the recipe on 

http://www.eyrie.org/~eagle/notes/debian/git.html#convert

-- 
Dominic Hargreaves | http://www.larted.org.uk/~dom/
PGP key 5178E2A5 from the.earth.li (keyserver,web,email)

___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel


Re: [DebianGIS-dev] Mapnik repository

2009-11-10 Thread David Paleino
Dominic Hargreaves wrote:

 On Tue, Nov 10, 2009 at 02:13:17PM +0100, David Paleino wrote:
 What I mean is the git-buildpackage layout, i.e.
 
 master # where Debian development happens, i.e. debian/
 pristine-tar   # where pristine-tar deltas are stored
 upstream   # where upstream sources are kept, to be merged in
  master
 
 This eases tracking upstream versions, and managing multiple uploads to
 Debian (let's say: sid (master), experimental, backports, [..] (all these
 in separate branches mimicking master and upstream)
 
 It looks like I might have neglected to push the upstream and
 pristine-tar branches from my repo to git.debian.org. I can probably
 still push them to the old repo if you want to try and reconstruct a
 clean history.

Yes, please.

  Or for that matter, start again from the known good respository that
  you obviously have (mapnik-old.git).
 
 I don't think I easily can, but I should try.
 
 Was mapnik-old.git (the one you pushed) generated/converted from some
 other repo? Or was it your main development repo?
 
 I created a repo from my private subversion repository by mostly
 following the recipe on
 
 http://www.eyrie.org/~eagle/notes/debian/git.html#convert

I usually follow:

  http://wiki.debian.org/Alioth/Git#ConvertaSVNAliothrepositorytoGit
  (plus another link I can't find now)

but, that seems the same as eyrie.org.

Please, git push --all, and let's see what can be done.

Thank you,
David

-- 
 . ''`.   Debian developer | http://wiki.debian.org/DavidPaleino
 : :'  : Linuxer #334216 --|-- http://www.hanskalabs.net/
 `. `'`  GPG: 1392B174 | http://snipr.com/qa_page
   `-   2BAB C625 4E66 E7B8 450A C3E1 E6AA 9017 1392 B174


___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel