commit problem

[Hartmut Birr]

Hi,

I've fixed Alex' win32k changes. First, I try to commit the original
changes. I've used 'svn merge -r20366:20368
svn://svn.reactos.org/trunk/reactos' to get the changes and I'm using
'svn commit' to commit the changes again. I get an error message:

I:\Sandbox\ros_work\reactos>svn commit
Lösche         include\win32k\bitmaps.h
<snip>
Sende          w32api\include\wingdi.h
Übertrage Daten ................svn: Übertragen fehlgeschlagen (Details
folgen):
svn: Source url
'svn://svn.reactos.org/trunk/reactos/include/win32k/ntgdibad.h' is from
different repository
svn: Ihre Log-Meldung wurde in einer Temporärdatei abgelegt:
svn:    'I:/Sandbox/ros_work/reactos/svn-commit.2.tmp'

Usually, I get all error messages in german. What do I make wrong?

- Hartmut

[Ge van Geldorp]

> From: Hartmut Birr
>
> svn: Source url
> 'svn://svn.reactos.org/trunk/reactos/include/win32k/ntgdibad.h
> ' is from different repository

You might have checked out originally using svn.reactos.com, if so you need
to do the merge with svn.reactos.com (not .org) too.

GvG

[Casper Hornstrup]

This is at least the second time this has happened.
We should remove the svn.reactos.com DNS.

Casper
> -----Original Message-----
> From: [e-mail] [mailto:[e-mail]] On Behalf Of Ge van Geldorp
> Sent: 28. december 2005 21:11
> To: 'ReactOS Development List'
> Subject: RE: [ros-dev] commit problem
> > From: Hartmut Birr
> >
> > svn: Source url
> > 'svn://svn.reactos.org/trunk/reactos/include/win32k/ntgdibad.h
> > ' is from different repository
>
> You might have checked out originally using svn.reactos.com, if so you need
> to do the merge with svn.reactos.com (not .org) too.
>
> GvG
>
> Ros-dev mailing list
> [e-mail]
> http://www.reactos.org/mailman/listinfo/ros-dev

[Ge van Geldorp]

> From: Casper Hornstrup
>
> This is at least the second time this has happened.
> We should remove the svn.reactos.com DNS.

If nobody objects I'll remove it from DNS this weekend.

GvG

[Magnus Olsen]

no I think should stay

----- Original Message ----- 
From: "Casper Hornstrup" [e-mail]
To: "'ReactOS Development List'" [e-mail]
Sent: den 28 December 2005 21:55
Subject: RE: [ros-dev] commit problem
> This is at least the second time this has happened.
> We should remove the svn.reactos.com DNS.
>
> Casper
> > -----Original Message-----
> > From: [e-mail] [mailto:[e-mail]]

On Behalf Of Ge van Geldorp
> > Sent: 28. december 2005 21:11
> > To: 'ReactOS Development List'
> > Subject: RE: [ros-dev] commit problem
> > > From: Hartmut Birr
> > >
> > > svn: Source url
> > > 'svn://svn.reactos.org/trunk/reactos/include/win32k/ntgdibad.h
> > > ' is from different repository
> >
> > You might have checked out originally using svn.reactos.com, if so you

need
> > to do the merge with svn.reactos.com (not .org) too.
> >
> > GvG
> >
> > Ros-dev mailing list
> > [e-mail]
> > http://www.reactos.org/mailman/listinfo/ros-dev
>
> Ros-dev mailing list
> [e-mail]
> http://www.reactos.org/mailman/listinfo/ros-dev

[Steven Edwards]

On 12/28/05, Magnus Olsen [e-mail] wrote:
> no I think should stay

Its causing problems and does not help. Axe it.

--
Steven Edwards - ReactOS and Wine developer

"There is one thing stronger than all the armies in the world, and
that is an idea whose time has come." - Victor Hugo

[WaxDragon]

Remove svn.reactos.org

On 12/28/05, Steven Edwards [e-mail] wrote:
> On 12/28/05, Magnus Olsen [e-mail] wrote:
> > no I think should stay
>
> Its causing problems and does not help. Axe it.
>
> --
> Steven Edwards - ReactOS and Wine developer
>
> "There is one thing stronger than all the armies in the world, and
> that is an idea whose time has come." - Victor Hugo
>
> Ros-dev mailing list
> [e-mail]
> http://www.reactos.org/mailman/listinfo/ros-dev

--
<Alex_Ionescu> it's like saying let's rename Ke to Kernel because
people think it's Ketchup

[Casper Hornstrup]

.org?
> -----Original Message-----
> From: [e-mail] [mailto:[e-mail]] On Behalf Of WaxDragon
> Sent: 29. december 2005 06:22
> To: ReactOS Development List
> Subject: Re: [ros-dev] commit problem
>
> Remove svn.reactos.org
>
> On 12/28/05, Steven Edwards [e-mail] wrote:
> > On 12/28/05, Magnus Olsen [e-mail] wrote:
> > > no I think should stay
> >
> > Its causing problems and does not help. Axe it.
> >
> > --
> > Steven Edwards - ReactOS and Wine developer
> >
> > "There is one thing stronger than all the armies in the world, and
> > that is an idea whose time has come." - Victor Hugo
> >
> > Ros-dev mailing list
> > [e-mail]
> > http://www.reactos.org/mailman/listinfo/ros-dev
>
> --
> <Alex_Ionescu> it's like saying let's rename Ke to Kernel because
> people think it's Ketchup
>
> Ros-dev mailing list
> [e-mail]
> http://www.reactos.org/mailman/listinfo/ros-dev

[David Hinz]

Before you guys remove svn.reactos.com, could you at least provide some 
info how exactly the svn switch --relocate works?

Greets,

David Hinz

Casper Hornstrup schrieb:
> .org?
> > -----Original Message-----
> > From: [e-mail] [mailto:[e-mail]] On Behalf Of WaxDragon
> > Sent: 29. december 2005 06:22
> > To: ReactOS Development List
> > Subject: Re: [ros-dev] commit problem
> >
> > Remove svn.reactos.org
> >
> > On 12/28/05, Steven Edwards [e-mail] wrote:
> > > On 12/28/05, Magnus Olsen [e-mail] wrote:
> > > > no I think should stay
> > >
> > > Its causing problems and does not help. Axe it.
> > >
> > > --
> > > Steven Edwards - ReactOS and Wine developer
> > >
> > > "There is one thing stronger than all the armies in the world, and
> > > that is an idea whose time has come." - Victor Hugo
> > >
> > > Ros-dev mailing list
> > > [e-mail]
> > > http://www.reactos.org/mailman/listinfo/ros-dev
> >
> > --
> > <Alex_Ionescu> it's like saying let's rename Ke to Kernel because
> > people think it's Ketchup
> >
> > Ros-dev mailing list
> > [e-mail]
> > http://www.reactos.org/mailman/listinfo/ros-dev
>
> Ros-dev mailing list
> [e-mail]
> http://www.reactos.org/mailman/listinfo/ros-dev

[Ge van Geldorp]

> From: David Hinz
>
> Before you guys remove svn.reactos.com, could you at least 
> provide some info how exactly the svn switch --relocate works?

Go to your reactos working copy, then "svn switch --relocate
svn://svn.reactos.com/trunk/reactos svn://svn.reactos.org/trunk/reactos".
Since there was an objection, I'm not going to remove it this weekend. Maybe
after some more discussion.

GvG

[David Hinz]

Yeah, thanks, that worked.
Maybe you should announce the removal of that DNS entry on the 
ros-general and ros-dev mailing lists and on our website together with 
the information how to use svn switch --relocate.

Ge van Geldorp schrieb:
> > From: David Hinz
> >
> > Before you guys remove svn.reactos.com, could you at least 
> > provide some info how exactly the svn switch --relocate works?
>
> Go to your reactos working copy, then "svn switch --relocate
> svn://svn.reactos.com/trunk/reactos svn://svn.reactos.org/trunk/reactos".
> Since there was an objection, I'm not going to remove it this weekend. Maybe
> after some more discussion.
>
> GvG
>
> Ros-dev mailing list
> [e-mail]
> http://www.reactos.org/mailman/listinfo/ros-dev

[WaxDragon]

Say you have a checkout in ~/src/reactos that was originally checked
out from svn://svn.reactos.com/trunk/reactos.  from the root of the
checkout (~src/reactos) issue:

svn switch --relocate svn://svn.reactos.com/trunk/reactos
svn://svn.reactos.org/trunk/reactos

That's it, at least if you use the cli svn client.  Maybe someone will
post directions for TortiseSVN.

On 12/29/05, David Hinz [e-mail] wrote:
> Before you guys remove svn.reactos.com, could you at least provide some
> info how exactly the svn switch --relocate works?
>
> Greets,
>
> David Hinz
>
> Casper Hornstrup schrieb:
> > .org?
> > > -----Original Message-----
> > > From: [e-mail] [mailto:[e-mail]] On Behalf Of WaxDragon
> > > Sent: 29. december 2005 06:22
> > > To: ReactOS Development List
> > > Subject: Re: [ros-dev] commit problem
> > >
> > > Remove svn.reactos.org
> > >
> > > On 12/28/05, Steven Edwards [e-mail] wrote:
> > > > On 12/28/05, Magnus Olsen [e-mail] wrote:
> > > > > no I think should stay
> > > >
> > > > Its causing problems and does not help. Axe it.
> > > >
> > > > --
> > > > Steven Edwards - ReactOS and Wine developer
> > > >
> > > > "There is one thing stronger than all the armies in the world, and
> > > > that is an idea whose time has come." - Victor Hugo
> > > >
> > > > Ros-dev mailing list
> > > > [e-mail]
> > > > http://www.reactos.org/mailman/listinfo/ros-dev
> > >
> > > --
> > > <Alex_Ionescu> it's like saying let's rename Ke to Kernel because
> > > people think it's Ketchup
> > >
> > > Ros-dev mailing list
> > > [e-mail]
> > > http://www.reactos.org/mailman/listinfo/ros-dev
> >
> > Ros-dev mailing list
> > [e-mail]
> > http://www.reactos.org/mailman/listinfo/ros-dev
>
> Ros-dev mailing list
> [e-mail]
> http://www.reactos.org/mailman/listinfo/ros-dev

--
<Alex_Ionescu> it's like saying let's rename Ke to Kernel because
people think it's Ketchup

[Maarten Bosma]

WaxDragon schrieb:
> Say you have a checkout in ~/src/reactos that was originally checked
> out from svn://svn.reactos.com/trunk/reactos.  from the root of the
> checkout (~src/reactos) issue:
>
> svn switch --relocate svn://svn.reactos.com/trunk/reactos
> svn://svn.reactos.org/trunk/reactos
>
> That's it, at least if you use the cli svn client.  Maybe someone will
> post directions for TortiseSVN.

Just right click in root dir, chosse "TortiseSVN > Switch..." and then enter
svn://svn.reactos.org/trunk/reactos into the dialog.

Maarten Bosma

[Maarten Bosma]

Sorry I meant relocate not switch. It will give you a warning that it would
destroy your Working Copy but it did not for me.

Maarten Bosma wrote:
> WaxDragon schrieb:
> > Say you have a checkout in ~/src/reactos that was originally checked
> > out from svn://svn.reactos.com/trunk/reactos.  from the root of the
> > checkout (~src/reactos) issue:
> >
> > svn switch --relocate svn://svn.reactos.com/trunk/reactos
> > svn://svn.reactos.org/trunk/reactos
> >
> > That's it, at least if you use the cli svn client.  Maybe someone will
> > post directions for TortiseSVN.
>
> Just right click in root dir, chosse "TortiseSVN > Switch..." and then 
> enter
> svn://svn.reactos.org/trunk/reactos into the dialog.
>
> Maarten Bosma

[WaxDragon]

sorry, typo. you see which one I am used to typing now. 
svn.reactos.com can go. ;0)

On 12/29/05, Casper Hornstrup [e-mail] wrote:
> .org?
> > -----Original Message-----
> > From: [e-mail] [mailto:[e-mail]] On Behalf Of WaxDragon
> > Sent: 29. december 2005 06:22
> > To: ReactOS Development List
> > Subject: Re: [ros-dev] commit problem
> >
> > Remove svn.reactos.org
> >
> > On 12/28/05, Steven Edwards [e-mail] wrote:
> > > On 12/28/05, Magnus Olsen [e-mail] wrote:
> > > > no I think should stay
> > >
> > > Its causing problems and does not help. Axe it.
> > >
> > > --
> > > Steven Edwards - ReactOS and Wine developer
> > >
> > > "There is one thing stronger than all the armies in the world, and
> > > that is an idea whose time has come." - Victor Hugo
> > >
> > > Ros-dev mailing list
> > > [e-mail]
> > > http://www.reactos.org/mailman/listinfo/ros-dev
> >
> > --
> > <Alex_Ionescu> it's like saying let's rename Ke to Kernel because
> > people think it's Ketchup
> >
> > Ros-dev mailing list
> > [e-mail]
> > http://www.reactos.org/mailman/listinfo/ros-dev
>
> Ros-dev mailing list
> [e-mail]
> http://www.reactos.org/mailman/listinfo/ros-dev

--
<Alex_Ionescu> it's like saying let's rename Ke to Kernel because
people think it's Ketchup

[Royce Mitchell III]

Magnus Olsen wrote:
> no I think should stay

Would you please explain why you think svn.reactos.com should stay? ( I
can't think of any good reason )

[Magnus Olsen]

1. I like use svn.reactos.com
that is the reason

----- Original Message ----- 
From: "Royce Mitchell III" [e-mail]
To: "ReactOS Development List" [e-mail]
Sent: den 29 December 2005 16:00
Subject: Re: [ros-dev] commit problem
> Magnus Olsen wrote:
> > no I think should stay
>
> Would you please explain why you think svn.reactos.com should stay? ( I
> can't think of any good reason )
>
> Ros-dev mailing list
> [e-mail]
> http://www.reactos.org/mailman/listinfo/ros-dev

[Ged Murphy]

Magnus Olsen wrote:
> I like use svn.reactos.com
>
> that is the reason

lol, that is a terrible reason.
Made me laugh though :)

[Ge van Geldorp]

> From: Magnus Olsen
> I like use svn.reactos.com
>
> that is the reason

In that case you can just add "213.173.252.2 svn.reactos.com" to your
%SystemRoot%\System32\drivers\etc\hosts file

GvG

[Royce Mitchell III]

Ge van Geldorp wrote:
> > From: Magnus Olsen
> > I like use svn.reactos.com
> >
> > that is the reason
>
> In that case you can just add "213.173.252.2 svn.reactos.com" to your
> %SystemRoot%\System32\drivers\etc\hosts file
>
> GvG

or if you're into "typing shortcuts", point "rossvn" to that ip, it 
doesn't have to be a FQDN.

[Casper Hornstrup]

Is your working copy at svn.reactos.org or svn.reactos.com? You can use svn switch --relocate if it is not at svn.reactos.org.

Casper
> -----Original Message-----
> From: [e-mail] [mailto:[e-mail]] On Behalf Of Hartmut Birr
> Sent: 28. december 2005 20:58
> To: ReactOS Development List
> Subject: [ros-dev] commit problem
>
> Hi,
>
> I've fixed Alex' win32k changes. First, I try to commit the original
> changes. I've used 'svn merge -r20366:20368
> svn://svn.reactos.org/trunk/reactos' to get the changes and I'm using
> 'svn commit' to commit the changes again. I get an error message:
>
> I:\Sandbox\ros_work\reactos>svn commit
> Lösche         include\win32k\bitmaps.h
>
> <snip>
> Sende          w32api\include\wingdi.h
> Übertrage Daten ................svn: Übertragen fehlgeschlagen (Details
> folgen):
> svn: Source url
> 'svn://svn.reactos.org/trunk/reactos/include/win32k/ntgdibad.h' is from
> different repository
> svn: Ihre Log-Meldung wurde in einer Temporärdatei abgelegt:
> svn:    'I:/Sandbox/ros_work/reactos/svn-commit.2.tmp'
>
> Usually, I get all error messages in german. What do I make wrong?
> Hartmut
>
> Ros-dev mailing list
> [e-mail]
> http://www.reactos.org/mailman/listinfo/ros-dev

[WaxDragon]

I am interested to know what the fix was, since I've been looking into
this all morning.

On 12/28/05, Hartmut Birr [e-mail] wrote:
> Hi,
>
> I've fixed Alex' win32k changes. First, I try to commit the original
> changes. I've used 'svn merge -r20366:20368
> svn://svn.reactos.org/trunk/reactos' to get the changes and I'm using
> 'svn commit' to commit the changes again. I get an error message:
>
> I:\Sandbox\ros_work\reactos>svn commit
> Lösche         include\win32k\bitmaps.h
>
> <snip>
> Sende          w32api\include\wingdi.h
> Übertrage Daten ................svn: Übertragen fehlgeschlagen (Details
> folgen):
> svn: Source url
> 'svn://svn.reactos.org/trunk/reactos/include/win32k/ntgdibad.h' is from
> different repository
> svn: Ihre Log-Meldung wurde in einer Temporärdatei abgelegt:
> svn:    'I:/Sandbox/ros_work/reactos/svn-commit.2.tmp'
>
> Usually, I get all error messages in german. What do I make wrong?
> Hartmut
>
> Ros-dev mailing list
> [e-mail]
> http://www.reactos.org/mailman/listinfo/ros-dev

WD
--
<Alex_Ionescu> it's like saying let's rename Ke to Kernel because
people think it's Ketchup

[Hartmut Birr]

WaxDragon wrote:
> I am interested to know what the fix was, since I've been looking into
> this all morning.

Some icon/cursor structures need a 1 byte alignment. The structures was
moved from cursoricon.h to ntusertyp.h without the pshpack1.h/poppack.h
include files.

- Hartmut