Re: avr-gcc (WinAvr) SubVersion

Sep 06, 2005 Last reply: 20 years ago 6 Replies
S


AS> HÏ ÉÍÅÅÔ ÎÅÄÏÓÔÁÔÏË, ÎÁ ÍÏÊ ×ÚÇÌÑÄ - ÎÕÍÅÒÁÃÉÑ ÒÅ×ÉÚÉÊ ÐÒÏÓÔÙÍÉ ÞÉÓÌÁÍÉ


> AS> (Ô.Å. 1, 2, 3, 4, 5, Á ÎÅ 1.1, 1.2, 1.3, 2.1, 2.2)
òÅ×ÉÚÉÑ ÒÅÐÏÚÉÔÏÒÉÑ ÎÅ ÍÅÛÁÅÔ ÄÅÌÁÔØ Ó×ÏÀ ÎÕÍÅÒÁÃÉÀ ÒÅÌÉÚÏ×. äÅÌÁÊ copy × ËÁÔÁÌÏÇ tags, ÍÅÓÔÏ × ÒÅÐÏÚÉÔÏÒÉÉ ÐÒÉ ÜÔÏÍ ÎÅ ÒÁÓÈÏÄÕÅÔÓÑ.
[skip]
HÅ ÚÎÁÀ, ËÔÏ ËÁË, Á Ñ Ó cvs ÒÅÇÕÌÑÒÎÏ ÎÁÒÙ×ÁÌÓÑ ÎÁ ÜÔÉ É ÄÒÕÇÉÅ ÇÒÁÂÌÉ. > þÔÏ
> ÓÏÚÄÁ×ÁÌÏ ÓÏÓÔÏÑÎÉÅ ÎÅËÏÍÆÏÒÔÎÏÓÔÉ. á ×ÏÔ svn ÍÎÅ ÓÒÁÚÕ ÐÏËÁÔÉÌ. óÞÉÔÁÀ, ÞÔÏ
> svn ÎÁ ÇÏÌÏ×Õ ×ÙÛÅ cvs, ÞÔÏ, × ÏÂÝÅÍ-ÔÏ, ÌÏÇÉÞÎÏ, Ô.Ë. ÐÅÒ×ÁÑ ÐÏÚÁÉÍÓÔ×Ï×ÁÌÁ > ÉÚ
> ×ÔÏÒÏÊ ×ÓÅ ÓÁÍÏÅ ÌÕÞÛÅÅ É ÌÉÛÅÎÁ ÅÅ ÎÅÄÏÓÔÁÔËÏ×.
ë ×ÅÌÉËÏÍÕ ÓÏÖÁÌÅÎÉÀ ÎÅ ×ÓÅÈ ÎÅÄÏÓÔÁÔËÏ× ÌÉÛÅÎ. íÎÏÖÅÓÔ×ÅÎÎÙÅ merge ÎÁÄÏ ÁËËÕÒÁÔÎÏ ÄÅÌÁÔØ, ËÁË É ÒÁÎØÛÅ...

PS: âÌÉÎ, ÞÔÏ ÚÁ ÍÁÎÉÑ ÐÏÄ ÔÅÍÏÊ "ÐÒÏ ËÏÛÅË" ÏÂÓÕÖÄÁÔØ ÞÉÓÔÏÔÕ ×ÏÄÙ...


_______ óÅÒÇÅÊ.

Vote
Twitter Facebook LinkedIn
S

ðÏÌÎÏÓÔØÀ ÐÏÄÄÅÒÖÉ×ÁÀ. ëÓÔÁÔÉ, ÕÖÅ ÐÅÒÅ×ÅÌÉ ÎÁ ÒÕÓÓËÉÊ ÂÏÌØÛÕÀ ÞÁÓÔØ ÄÏËÉ
formatting link
_______ óÅÒÇÅÊ.
Vote
Twitter Facebook LinkedIn
H

Tue, 06 Sep 2005 14:43:30 +0400 Sergey Pinigin wrote to Harry Zhurov:

[...]

SP> ë ×ÅÌÉËÏÍÕ ÓÏÖÁÌÅÎÉÀ ÎÅ ×ÓÅÈ ÎÅÄÏÓÔÁÔËÏ× ÌÉÛÅÎ. íÎÏÖÅÓÔ×ÅÎÎÙÅ merge SP> ÎÁÄÏ ÁËËÕÒÁÔÎÏ ÄÅÌÁÔØ, ËÁË É ÒÁÎØÛÅ...

Merge ×ÏÏÂÝÅ ÏÔ×ÅÔÓÔ×ÅÎÎÁÑ É, ÉÍÈÏ, ÏÐÁÓÎÁÑ ×ÅÝØ, ÚÄÅÓØ ÂÅÚ ÁËËÕÒÁÔÎÏÓÔÉ ×ÏÏÂÝÅ ÎÉËÁË. ìÕÞÛÅ, ÉÍÈÏ, ÐÏ ×ÏÚÍÏÖÎÏÓÔÉ ÅÅ ÉÚÂÅÇÁÔØ.

SP> PS: SP> âÌÉÎ, ÞÔÏ ÚÁ ÍÁÎÉÑ ÐÏÄ ÔÅÍÏÊ "ÐÒÏ ËÏÛÅË" ÏÂÓÕÖÄÁÔØ ÞÉÓÔÏÔÕ ×ÏÄÙ...

üÔÏ ÐÏÔÏÍÕ, ÞÔÏ "ÎÁÓÔÏÑÝÉÅ ÆÉÄÏÛÎÉËÉ" ÓÁÂÖÁ ÎÅ ÍÅÎÑÀÔ. :)
Vote
Twitter Facebook LinkedIn
A
ðÒÉ×ÅÔ Harry!

06 Sep 05 16:02, Harry Zhurov ÐÉÓÁÌ Sergey Pinigin:

HZ> Merge ×ÏÏÂÝÅ ÏÔ×ÅÔÓÔ×ÅÎÎÁÑ É, ÉÍÈÏ, ÏÐÁÓÎÁÑ ×ÅÝØ, ÚÄÅÓØ ÂÅÚ HZ> ÁËËÕÒÁÔÎÏÓÔÉ ×ÏÏÂÝÅ ÎÉËÁË. ìÕÞÛÅ, ÉÍÈÏ, ÐÏ ×ÏÚÍÏÖÎÏÓÔÉ ÅÅ ÉÚÂÅÇÁÔØ.

? ÷ÏÔ ÔÅ ÒÁÚ. á Õ ÍÅÎÑ ÜÔÏ - ÇÌÁ×ÎÁÑ ÏÐÅÒÁÃÉÑ. ëÁË ÐÒÁ×ÉÌÏ, ÉÚÍÅÎÅÎÉÑ × HEAD ×ÎÏÓÑÔÓÑ ËÁË merge ËÁËÏÊ-ÌÉÂÏ ×ÅÔËÉ.

HZ> üÔÏ ÐÏÔÏÍÕ, ÞÔÏ "ÎÁÓÔÏÑÝÉÅ ÆÉÄÏÛÎÉËÉ" ÓÁÂÖÁ ÎÅ ÍÅÎÑÀÔ. :)

é ÎÅ ÞÉÔÁÀÔ. :) ÷ÓÅÇÏ ÎÁÉÌÕÞÛÅÇÏ, [Team PCAD 2000] áÌÅËÓÅÊ í. ... ðÒÏÇÒÁÍÍÉÓÔÙ ÚÎÁÀÔ, ÞÔÏ ÎÁ ËÁÖÄÕÀ ÕÌÉÃÕ ðÕÛËÉÎÁ ÄÏÌÖÎÁ ÂÙÔØ ÕÌÉÃÁ ðÏÐËÉÎÁ.
Vote
Twitter Facebook LinkedIn
S

õ ËÁÖÄÏÇÏ Ó×ÏÉ ÍÅÔÏÄÙ. ÷ ÄÏËÅ ÎÁ svn ÒÅËÏÍÅÎÄÕÀÔ ÄÅÌÁÔØ ËÏÒÏÔËÉÅ ×ÅÔËÉ - ÓÏÚÄÁÌ ×ÅÔËÕ, ÞÔÏ-ÔÏ ÐÏÄÅÌÁÌ, ÍÅÒÇÅ(ÏÄÉÎ ÒÁÚ), ×ÅÔËÕ _ÕÄÁÌÉÌ_.

_______ óÅÒÇÅÊ.

Vote
Twitter Facebook LinkedIn
A

Hello Harry.

06 Sep 05 16:02, Harry Zhurov wrote to Sergey Pinigin:

HZ> Merge ×ÏÏÂÝÅ ÏÔ×ÅÔÓÔ×ÅÎÎÁÑ É, ÉÍÈÏ, ÏÐÁÓÎÁÑ ×ÅÝØ, ÚÄÅÓØ ÂÅÚ HZ> ÁËËÕÒÁÔÎÏÓÔÉ ×ÏÏÂÝÅ ÎÉËÁË. ìÕÞÛÅ, ÉÍÈÏ, ÐÏ ×ÏÚÍÏÖÎÏÓÔÉ ÅÅ ÉÚÂÅÇÁÔØ.

Merge ÄÏÓÔÁÔÏÞÎÏ pÑÄÏ×ÁÑ ×ÅÝØ, ËÏÔÏpÁÑ ÓÌyÞÁÅÔÓÑ ÞÁÓÔÏ, ÅÓÌÉ ÎÁÄ ÐpÏÅËÔÏÍ pÁÂÏÔÁÅÔ ÂÏÌÅÅ 1 ÞÅÌÏ×ÅËÁ. Megre pÁÚpyÌÉ×ÁÅÔÓÑ ×ÅÓØÍÁ ÐpÏÓÔÏ, ÅÓÌÉ ËÏÍÉÔ ÄÅÌÁÔØ ÂÏÌÅÅ ÉÌÉ ÍÅÎÅÅ ÞÁÓÔÏ, ÎÅ ÎÁËÁÐÌÉ×ÁÑ ÂÏÌØÛÏÅ ËÏÌÉÞÅÓÔ×Ï ÉÚÍÅÎÅÎÉÊ ÍÅÖÄy pÅ×ÉÚÉÑÍÉ. ôÁËÖÅ ÂÅÚ Megre ÐpÏÓÏ ÎÅ ÏÂÏÊÔÉÓØ ÅÓÌÉ ÓÌÉ×ÁÅÔÓÑ ×ÅÔ×Ø ÓÏ ÓÔ×ÏÌÏÍ. á ×ÅÔ×É - ÏÄÎÁ ÉÚ ÍÏÇyÞÉÈ ÆÉÛÅË CVS (Îy É ÄpyÇÉÈ ÓÉÓÔÅÍ, × ËÏÔÏpÙÈ ÏÎÉ ÅÓÔØ).

ó Õ×ÁÖÅÎÉÅÍ, Andy <mailto:andy coÂaËa svrw.ru>

icq 44341220

Vote
Twitter Facebook LinkedIn
H

Wed, 07 Sep 2005 07:54:44 +0400 Andy Mozzhevilov wrote to Harry Zhurov:

AM> 06 Sep 05 16:02, Harry Zhurov wrote to Sergey Pinigin:

HZ>> Merge ×ÏÏÂÝÅ ÏÔ×ÅÔÓÔ×ÅÎÎÁÑ É, ÉÍÈÏ, ÏÐÁÓÎÁÑ ×ÅÝØ, ÚÄÅÓØ ÂÅÚ HZ>> ÁËËÕÒÁÔÎÏÓÔÉ ×ÏÏÂÝÅ ÎÉËÁË. ìÕÞÛÅ, ÉÍÈÏ, ÐÏ ×ÏÚÍÏÖÎÏÓÔÉ ÅÅ ÉÚÂÅÇÁÔØ.

AM> Merge ÄÏÓÔÁÔÏÞÎÏ pÑÄÏ×ÁÑ ×ÅÝØ, ËÏÔÏpÁÑ ÓÌyÞÁÅÔÓÑ ÞÁÓÔÏ, ÅÓÌÉ ÎÁÄ ÐpÏÅËÔÏÍ AM> pÁÂÏÔÁÅÔ ÂÏÌÅÅ 1 ÞÅÌÏ×ÅËÁ. Megre pÁÚpyÌÉ×ÁÅÔÓÑ ×ÅÓØÍÁ ÐpÏÓÔÏ, ÅÓÌÉ ËÏÍÉÔ AM> ÄÅÌÁÔØ ÂÏÌÅÅ ÉÌÉ ÍÅÎÅÅ ÞÁÓÔÏ, ÎÅ ÎÁËÁÐÌÉ×ÁÑ ÂÏÌØÛÏÅ ËÏÌÉÞÅÓÔ×Ï ÉÚÍÅÎÅÎÉÊ AM> ÍÅÖÄy pÅ×ÉÚÉÑÍÉ.

÷ÏÔ ÉÍÅÎÎÏ! ïÐÑÔØ ×ÓÅ ÕÐÉÒÁÅÔÓÑ × ÞÅÌÏ×ÅÞÅÓËÉÊ ÆÁËÔÏÒ - ËÁË ÏÇÒÁÎÉÚÕÅÛØ, ÔÁË É ÏÇÒÅÂÅÛØ. :)

AM> ôÁËÖÅ ÂÅÚ Megre ÐpÏÓÏ ÎÅ ÏÂÏÊÔÉÓØ ÅÓÌÉ ÓÌÉ×ÁÅÔÓÑ ×ÅÔ×Ø ÓÏ ÓÔ×ÏÌÏÍ. á ×ÅÔ×É AM> - ÏÄÎÁ ÉÚ ÍÏÇyÞÉÈ ÆÉÛÅË CVS (Îy É ÄpyÇÉÈ ÓÉÓÔÅÍ, × ËÏÔÏpÙÈ ÏÎÉ ÅÓÔØ).

îÁÓËÏÌØËÏ Ñ ÐÏÎÑÌ, × svn Ó merge ×ÓÅ ÒÏ×ÎÏ (ÉÌÉ ÐÏÞÔÉ) ÔÁË ÖÅ, ËÁË É × cvs. äÁÖÅ ÅÓÔØ ÇÕÊÎÁÑ ÔÕÌÚÁ ÄÌÑ - ÔÒÉ ÐÁÎÅÌÉ, × ÌÅ×ÏÊ ÏÄÉÎ ×ÁÒÉÁÎÔ, × ÐÒÁ×ÏÊ - ÄÒÕÇÏÊ, ÓÎÉÚÕ ÒÅÚÕÌØÔÉÒÕÀÝÉÊ ÆÁÊÌ. ðÒÑÍÏ ÉÄÅÛØ ÐÏ ÏÔÌÉÞÉÑÍ É ×ÙÂÉÒÁÅÛØ, ËÁËÏÅ ÎÁÄÏ - ÏÎÏ × ÎÉÖÎÉÊ (ÒÅÚÕÌØÔÉÒÕÀÝÉÊ) É ÐÅÒÅÎÏÓÉÔÓÑ.
Vote
Twitter Facebook LinkedIn

Join the Discussion

Have something to add? Share your thoughts — no account required.

Didn't find your answer?

Ask the community — no account required