git-migration: Changes to 'master'

2007-02-06 Thread David Nusinow
scripts/xfonts-100dpi| 20 scripts/xfonts-75dpi | 20 scripts/xfonts-base | 20 scripts/xfonts-cyrillic | 20 scripts/xfonts-encodings | 20 scripts/xfonts-scalable |

git-migration: Changes to 'master'

2007-02-04 Thread David Nusinow
scripts/xbitmaps | 24 scripts/xcursor-themes | 24 scripts/xkb-data | 25 + scripts/xsfbs | 17 + 4 files changed, 90 insertions(+) New commits: commit 61cfd2ffc5bca2dff253a8bbc

git-migration: Changes to 'master'

2007-02-04 Thread David Nusinow
scripts/twm | 24 scripts/xbase-clients | 20 scripts/xfs | 25 + scripts/xprint-utils | 20 scripts/xutils| 20 scripts/xutils-dev| 20 +

git-migration: Changes to 'master'

2007-02-03 Thread Julien Cristau
scripts/xdm | 25 + 1 files changed, 25 insertions(+) New commits: commit 2d0091768fc783a1fc65110bbae30e40264b0788 Author: Julien Cristau <[EMAIL PROTECTED]> Date: Sat Feb 3 11:12:57 2007 +0100 Add migration script for xdm. diff --git a/scripts/xdm b/scripts/xdm

git-migration: Changes to 'master'

2007-01-14 Thread Julien Cristau
scripts/xterm |1 + 1 files changed, 1 insertion(+) New commits: commit a75220ce0f4cf3cbaff0d7dcad40df28d5423fe0 Author: Julien Cristau <[EMAIL PROTECTED]> Date: Mon Jan 15 04:36:27 2007 +0100 Add etch branch to xterm's conversion script. diff --git a/scripts/xterm b/scripts/xterm ind

Re: git-migration: Changes to 'master'

2007-01-09 Thread David Nusinow
On Tue, Jan 09, 2007 at 09:35:01AM +0100, Michel Dänzer wrote: > On Mon, 2007-01-08 at 22:08 -0500, David Nusinow wrote: > > On Mon, Jan 08, 2007 at 09:06:19PM -0500, David Nusinow wrote: > > > Is this worth the overhead of maintaining the upstream branches? I'm not > > > sure. Currently, our delta

Re: git-migration: Changes to 'master'

2007-01-09 Thread Michel Dänzer
On Mon, 2007-01-08 at 22:08 -0500, David Nusinow wrote: > On Mon, Jan 08, 2007 at 09:06:19PM -0500, David Nusinow wrote: > > Is this worth the overhead of maintaining the upstream branches? I'm not > > sure. Currently, our deltas from the usptream releases aren't that big for > > anything but the s

Re: git-migration: Changes to 'master'

2007-01-08 Thread David Nusinow
On Mon, Jan 08, 2007 at 09:06:19PM -0500, David Nusinow wrote: > Is this worth the overhead of maintaining the upstream branches? I'm not > sure. Currently, our deltas from the usptream releases aren't that big for > anything but the server, so this really may not be worthwhile. I tend to > just lo

Re: git-migration: Changes to 'master'

2007-01-08 Thread David Nusinow
On Mon, Jan 08, 2007 at 02:32:30PM +1100, Drew Parsons wrote: > David wrote: > > The reason for using upstream branches is twofold: > > > > 1) git-buildpackage expects to have it. It's nice to actually have access > > to this tool where we couldn't use svn-buildpackage, although there's > >

Re: git-migration: Changes to 'master'

2007-01-07 Thread Drew Parsons
David wrote: > On Sun, Jan 07, 2007 at 08:38:08PM +1100, Drew Parsons wrote: > > > > Yeah, Michel is probably right, it seems I don't really understand what the > > intention with the upstream branches is. I had thought the idea was to > > facilitate pushing patches back to upstream, but if they

Re: git-migration: Changes to 'master'

2007-01-07 Thread David Nusinow
On Sun, Jan 07, 2007 at 08:38:08PM +1100, Drew Parsons wrote: > Michel wrote: > > On Wed, 2007-01-03 at 23:02 -0500, David Nusinow wrote: > > > > > > On Thu, Jan 04, 2007 at 02:25:05PM +1100, Drew Parsons wrote: > > > > > > > > > > Why did you use 'upstream-master'? I probably was unclear in what

Re: git-migration: Changes to 'master'

2007-01-07 Thread David Nusinow
On Thu, Jan 04, 2007 at 09:38:35AM +0100, Michel Dänzer wrote: > On Wed, 2007-01-03 at 23:02 -0500, David Nusinow wrote: > > > > On Thu, Jan 04, 2007 at 02:25:05PM +1100, Drew Parsons wrote: > > > David asked: > > > > > URL: ssh://git.debian.org/git/pkg-xorg/$debian.git > > > > > -Pull: refs/head

Re: git-migration: Changes to 'master'

2007-01-07 Thread Drew Parsons
Michel wrote: > On Wed, 2007-01-03 at 23:02 -0500, David Nusinow wrote: > > > > On Thu, Jan 04, 2007 at 02:25:05PM +1100, Drew Parsons wrote: > > > > > > > > Why did you use 'upstream-master'? I probably was unclear in what I > > > > wrote > > > > down, looking back on the draft. What I had in m

git-migration: Changes to 'master'

2007-01-04 Thread Thierry Reding
clone |9 ++--- 1 files changed, 6 insertions(+), 3 deletions(-) New commits: commit 75c06ace20520de03b672befc2f9b6adbd3b3514 Author: Thierry Reding <[EMAIL PROTECTED]> Date: Thu Jan 4 17:02:41 2007 +0100 Implement the git archive policy correctly. diff --git a/clone b/clone index

Re: git-migration: Changes to 'master'

2007-01-04 Thread Thierry Reding
* Michel Dänzer wrote: > On Wed, 2007-01-03 at 23:02 -0500, David Nusinow wrote: [...] > AFAICS the beryl repositories don't have merge commits from upstream > repos though, so one still has to figure out which upstream branch(es) > the upstream bits came from, and there's no upstream history. Is t

Re: git-migration: Changes to 'master'

2007-01-04 Thread Michel Dänzer
On Wed, 2007-01-03 at 23:02 -0500, David Nusinow wrote: > > On Thu, Jan 04, 2007 at 02:25:05PM +1100, Drew Parsons wrote: > > David asked: > > > > URL: ssh://git.debian.org/git/pkg-xorg/$debian.git > > > > -Pull: refs/heads/master:refs/heads/master-origin > > > > +Push: refs/heads/master:refs/hea

Re: git-migration: Changes to 'master'

2007-01-03 Thread Thierry Reding
* David Nusinow wrote: [...] > On Wed, Jan 03, 2007 at 05:53:29PM +0100, Thierry Reding wrote: > > clone | 26 ++ > > 1 files changed, 22 insertions(+), 4 deletions(-) > > > > New commits: > > commit 0726222645eb8e6e4f25056e8f7244b4566825e3 > > Author: Thierry Reding <[E

Re: git-migration: Changes to 'master'

2007-01-03 Thread David Nusinow
Hi Drew, On Thu, Jan 04, 2007 at 02:25:05PM +1100, Drew Parsons wrote: > David asked: > > > URL: ssh://git.debian.org/git/pkg-xorg/$debian.git > > > -Pull: refs/heads/master:refs/heads/master-origin > > > +Push: refs/heads/master:refs/heads/debian-unstable > > > +Push: refs/heads/upstream-master:

Re: git-migration: Changes to 'master'

2007-01-03 Thread Drew Parsons
David asked: > > URL: ssh://git.debian.org/git/pkg-xorg/$debian.git > > -Pull: refs/heads/master:refs/heads/master-origin > > +Push: refs/heads/master:refs/heads/debian-unstable > > +Push: refs/heads/upstream-master:refs/heads/upstream-master > > Why did you use 'upstream-master'? I probably was

Re: git-migration: Changes to 'master'

2007-01-03 Thread David Nusinow
On Wed, Jan 03, 2007 at 05:53:29PM +0100, Thierry Reding wrote: > clone | 26 ++ > 1 files changed, 22 insertions(+), 4 deletions(-) > > New commits: > commit 0726222645eb8e6e4f25056e8f7244b4566825e3 > Author: Thierry Reding <[EMAIL PROTECTED]> > Date: Wed Jan 3 17:50:

git-migration: Changes to 'master'

2007-01-03 Thread Thierry Reding
clone |2 +- 1 files changed, 1 insertion(+), 1 deletion(-) New commits: commit 1b1515ec6b91ab9aa7e4e4cb31bc8465f5d8fac4 Author: Thierry Reding <[EMAIL PROTECTED]> Date: Wed Jan 3 17:58:05 2007 +0100 Convert Pull: lines to Push: lines. diff --git a/clone b/clone index da15d46..e22f7b2

git-migration: Changes to 'master'

2007-01-03 Thread Thierry Reding
clone | 26 ++ 1 files changed, 22 insertions(+), 4 deletions(-) New commits: commit 0726222645eb8e6e4f25056e8f7244b4566825e3 Author: Thierry Reding <[EMAIL PROTECTED]> Date: Wed Jan 3 17:50:06 2007 +0100 Implement the proposed XSF git archive policy. diff --git

git-migration: Changes to 'master'

2006-12-18 Thread Thierry Reding
driver.template |2 +- library.template|2 +- proto.template |2 +- scripts/libx11 |2 +- scripts/libxkbfile |2 +- scripts/x11proto-compos

git-migration: Changes to 'master'

2006-12-18 Thread Thierry Reding
git-svnimport | 11 +++ scripts/libx11 |4 +--- scripts/x11proto-scrnsaver |4 ++-- scripts/xorg-server|4 +--- 4 files changed, 15 insertions(+), 8 deletions(-) New commits: commit 2d5784d1edd4da274165a39f578d5f08669d41f6 Author: Thierry Red

git-migration: Changes to 'master'

2006-12-15 Thread Thierry Reding
driver.map |2 -- scripts/xserver-xorg-video-i810 | 26 ++ scripts/xserver-xorg-video-i810-modesetting | 19 +++ 3 files changed, 45 insertions(+), 2 deletions(-) New commits: commit 66e6c1dc571eee9af2e5c

git-migration: Changes to 'master'

2006-12-15 Thread Thierry Reding
driver.map|3 --- scripts/xserver-xorg-input-citron | 28 scripts/xserver-xorg-input-mouse | 28 scripts/xserver-xorg-video-ati|3 +++ 4 files changed, 59 insertions(+), 3 deletions(-) New commits:

git-migration: Changes to 'master'

2006-12-15 Thread Thierry Reding
AUTHORS|1 + driver.map |2 +- driver.template|2 +- scripts/xserver-xorg-video-ati | 24 4 files changed, 27 insertions(+), 2 deletions(-) New commits: commit 5b979d8e1df397d1d90d84f3779f0afc5257be

git-migration: Changes to 'master'

2006-12-14 Thread Thierry Reding
gen-protos |2 +- scripts/x11proto-scrnsaver | 29 + 2 files changed, 30 insertions(+), 1 deletion(-) New commits: commit 421ad6e16e46c4998839d807054227c39d69234f Author: Thierry Reding <[EMAIL PROTECTED]> Date: Thu Dec 14 18:18:15 2006 +0100

git-migration: Changes to 'master'

2006-12-14 Thread Thierry Reding
AUTHORS|1 + driver.template|2 ++ gen-drivers|2 +- gen-libraries |2 +- git-svnimport |8 library.template |3 +++ proto.template |2 ++ scripts/libx11

git-migration: Changes to 'master'

2006-12-13 Thread Thierry Reding
scripts/libdrm | 24 scripts/mesa | 27 --- 2 files changed, 51 deletions(-) New commits: commit bd3877607d69c93a8c6fddb19916ff1736534425 Author: Thierry Reding <[EMAIL PROTECTED]> Date: Wed Dec 13 20:19:14 2006 +0100 Remove the libdrm

git-migration: Changes to 'master'

2006-12-13 Thread Thierry Reding
clone |8 driver.template| 20 ++-- library.template | 16 migrate|2 +- proto.template | 18 +- repack | 16 ++-- sc

git-migration: Changes to 'master'

2006-12-13 Thread Thierry Reding
git-svnimport |4 ++-- scripts/libdrm| 23 +++ scripts/mesa | 29 + scripts/xorg-server | 12 utils/check-file-diff | 13 + utils/check-files | 23 +++ utils/fi

git-migration: Changes to 'master'

2006-12-12 Thread Thierry Reding
driver.template| 12 +--- library.template |9 +++-- proto.template |9 - scripts/x11proto-composite | 21 + scripts/x11proto-gl| 23 +-- 5 files changed, 30 insertions(+), 44 deleti

git-migration: Changes to 'master'

2006-12-11 Thread Thierry Reding
driver.template | 26 +- library.template | 24 proto.template | 22 +++--- 3 files changed, 36 insertions(+), 36 deletions(-) New commits: commit ac500b219e36299c9d234514164004ba60da5f89 Author: Thierry Reding <[EMAIL PROT

git-migration: Changes to 'master'

2006-12-11 Thread Thierry Reding
clone |2 +- git-svnimport | 50 ++ scripts/xorg-server | 33 +++-- 3 files changed, 18 insertions(+), 67 deletions(-) New commits: commit e5984897402649d8caa1a6b2ad42e58f2ef0af58 Author: Thier

git-migration: Changes to 'master'

2006-12-09 Thread Thierry Reding
git-svnimport | 24 1 files changed, 24 insertions(+) New commits: commit 7ac57456cf1655b312c33e9ad41efccd0ba05e68 Author: Thierry Reding <[EMAIL PROTECTED]> Date: Sat Dec 9 13:34:13 2006 +0100 Add some code to remove the complete index when changing branch locat

git-migration: Changes to 'master'

2006-12-09 Thread Thierry Reding
package.map |1 - 1 files changed, 1 deletion(-) New commits: commit 272d9726634f102f18bb857a3027f33f31be77b9 Author: Thierry Reding <[EMAIL PROTECTED]> Date: Sat Dec 9 13:14:33 2006 +0100 Remove the second mesa entry from package.map. -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] w

git-migration: Changes to 'master'

2006-12-08 Thread Thierry Reding
package.map |1 + 1 files changed, 1 insertion(+) New commits: commit dda69fdc7e2ea4d61c28b76446279e137256b8f2 Author: Thierry Reding <[EMAIL PROTECTED]> Date: Fri Dec 8 23:17:59 2006 +0100 Add the Mesa library to the package.map file so the correct upstream repository can be clone

git-migration: Changes to 'master'

2006-12-08 Thread Thierry Reding
git-svnimport | 16 1 files changed, 8 insertions(+), 8 deletions(-) New commits: commit 0874f7a02301c48a127cfdad752436f33e7b61f4 Author: Thierry Reding <[EMAIL PROTECTED]> Date: Fri Dec 8 23:08:21 2006 +0100 Always check if a parent exists, undefine it otherwise.

git-migration: Changes to 'master'

2006-12-08 Thread Thierry Reding
clone |6 ++ setup-repositories | 50 ++ 2 files changed, 56 insertions(+) New commits: commit 1e2c09d66590072d7f953a3f4fe2595ab28b2c34 Author: Thierry Reding <[EMAIL PROTECTED]> Date: Fri Dec 8 22:26:52 2006 +0100 Add

git-migration: Changes to 'master'

2006-12-08 Thread Thierry Reding
check-history | 32 scripts/xorg-server |7 ++- 2 files changed, 34 insertions(+), 5 deletions(-) New commits: commit ddbca0dc58a73ba33eba648341cbc14c0984442a Author: Thierry Reding <[EMAIL PROTECTED]> Date: Fri Dec 8 21:45:13 2006 +0100 Add

git-migration: Changes to 'master'

2006-12-08 Thread Thierry Reding
driver.template |7 +++ gen-drivers | 12 +++- 2 files changed, 18 insertions(+), 1 deletion(-) New commits: commit 3c702206249a2ec740f40d272e899a3ad5941eec Author: Thierry Reding <[EMAIL PROTECTED]> Date: Fri Dec 8 20:38:01 2006 +0100 Add missing trunk locations for

git-migration: Changes to 'master'

2006-12-08 Thread Thierry Reding
migrate |3 ++- 1 files changed, 2 insertions(+), 1 deletion(-) New commits: commit 64c12ac991312400fa013928aa6f92ecbfa7ccef Author: Thierry Reding <[EMAIL PROTECTED]> Date: Fri Dec 8 12:38:40 2006 +0100 Run "git-repack -a -d" on all the repositories after they've been converted.

git-migration: Changes to 'master'

2006-12-08 Thread Thierry Reding
check-history |7 ++- library.template |6 ++ proto.template |5 + scripts/libx11 |6 +- scripts/x11proto-composite |6 -- scripts/x11proto-gl|8 +--- 6 files changed, 31 insertions(+), 7 deletio

git-migration: Changes to 'master'

2006-12-07 Thread Thierry Reding
common |2 +- gen-libraries |2 +- scripts/libx11 | 26 ++ 3 files changed, 28 insertions(+), 2 deletions(-) New commits: commit 4d96ecbb7b81c9e048c9b4fc328456b4a8c58397 Author: Thierry Reding <[EMAIL PROTECTED]> Date: Thu Dec 7 19:17:58 2006 +0100

git-migration: Changes to 'master'

2006-12-07 Thread Thierry Reding
check-history |9 + 1 files changed, 9 insertions(+) New commits: commit 7aadc9968a043aa87bb2b6ee9e91c82bdb87a5af Author: Thierry Reding <[EMAIL PROTECTED]> Date: Thu Dec 7 18:47:30 2006 +0100 Add a script to check individual import log files to see whether the index is un

git-migration: Changes to 'master'

2006-12-07 Thread Thierry Reding
scripts/xorg-server |6 +- 1 files changed, 5 insertions(+), 1 deletion(-) New commits: commit df56f2833a6c251fb3e3d8388ba133b4b86c87e4 Author: Thierry Reding <[EMAIL PROTECTED]> Date: Thu Dec 7 18:35:02 2006 +0100 Add vendor/7.0/xserver/xorg-server-1.0.2 to the list of trunk locat

git-migration: Changes to 'master'

2006-12-07 Thread Thierry Reding
gen-protos |2 +- scripts/x11proto-composite | 26 ++ scripts/x11proto-gl| 28 3 files changed, 55 insertions(+), 1 deletion(-) New commits: commit 4ac8df6f11d6c74c1ec8286466d98708cce53ed9 Author: Thierry Reding

git-migration: Changes to 'master'

2006-12-07 Thread Julien Cristau
scripts/xterm |1 + 1 files changed, 1 insertion(+) New commits: commit 00bceaa1f59f39f91212b7e839e42494923f4edf Author: Julien Cristau <[EMAIL PROTECTED]> Date: Thu Dec 7 16:09:47 2006 +0100 Add branches/7.1/app/xterm to the TRUNK variable. -- To UNSUBSCRIBE, email to [EMAIL PROTEC

git-migration: Changes to 'master'

2006-12-07 Thread Thierry Reding
import |8 1 files changed, 8 insertions(+) New commits: commit 556c4e6c508b916cb88feab89f3abb6360f7c130 Author: Thierry Reding <[EMAIL PROTECTED]> Date: Thu Dec 7 15:49:08 2006 +0100 Use sensible defaults if xorg_svn and svn_prefix are not set. -- To UNSUBSCRIBE, email to