[sip-comm-dev] Merging alpha2 code to the trunk


#1

Hi devs,

Congratulation for the alpha2 release!
If you committed some code to the alpha2 that should also be merged to the trunk, don't forget to do it.

Cheers,
Romain

···

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@sip-communicator.dev.java.net
For additional commands, e-mail: dev-help@sip-communicator.dev.java.net


#2

Hi,

I am actually wondering why a new branch has been created for alpha2
anyway. Is there any code in the alpha2 version which is not also
supposed to be put into the trunk for further development? Or is there
another reason for this?

Not that I'm too experienced with version control systems, just curious
:wink:

Cheers,
Ralph

···

-----Original Message-----
From: Romain KUNTZ [mailto:kuntz@clarinet.u-strasbg.fr]
Sent: Monday, November 05, 2007 5:11 PM
To: dev@sip-communicator.dev.java.net
Subject: [sip-comm-dev] Merging alpha2 code to the trunk

Hi devs,

Congratulation for the alpha2 release!
If you committed some code to the alpha2 that should also be
merged to the trunk, don't forget to do it.

Cheers,
Romain

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@sip-communicator.dev.java.net
For additional commands, e-mail:
dev-help@sip-communicator.dev.java.net

###########################################
CONFIDENTIALITY: This e-mail and any attachments are
confidential and may also be privileged.
If you are not the designated recipient, please notify the
sender immediately by reply e-mail and destroy all copies
(digital and paper).
Any unauthorized disclosure, distribution, copying, storage
or use of the information contained in this e-mail or any
attachments is strictly prohibited and may be unlawful.

###########################################
CONFIDENTIALITY: This e-mail and any attachments are confidential and may also be privileged.
If you are not the designated recipient, please notify the sender immediately by reply e-mail and destroy all copies (digital and paper).
Any unauthorized disclosure, distribution, copying, storage or use of the information contained in this e-mail or any attachments is strictly prohibited and may be unlawful.

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@sip-communicator.dev.java.net
For additional commands, e-mail: dev-help@sip-communicator.dev.java.net


#3

I am actually wondering why a new branch has been created for alpha2
anyway. Is there any code in the alpha2 version which is not also
supposed to be put into the trunk for further development? Or is there
another reason for this?

most or all the code for the alpha2 is supposed to be in the trunk, however some code in the trunk was not supposed to be in alpha2, that's why we created a new branch for alpha2. This allows developers to go on committing their ongoing work to the trunk without disturbing the code to be released for alpha2.

Cheers,
romain

···

On 2007/11/06, at 15:44, <ralph.weires@hitec.lu> wrote:

-----Original Message-----
From: Romain KUNTZ [mailto:kuntz@clarinet.u-strasbg.fr]
Sent: Monday, November 05, 2007 5:11 PM
To: dev@sip-communicator.dev.java.net
Subject: [sip-comm-dev] Merging alpha2 code to the trunk

Hi devs,

Congratulation for the alpha2 release!
If you committed some code to the alpha2 that should also be
merged to the trunk, don't forget to do it.

Cheers,
Romain

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@sip-communicator.dev.java.net
For additional commands, e-mail:
dev-help@sip-communicator.dev.java.net

###########################################
CONFIDENTIALITY: This e-mail and any attachments are
confidential and may also be privileged.
If you are not the designated recipient, please notify the
sender immediately by reply e-mail and destroy all copies
(digital and paper).
Any unauthorized disclosure, distribution, copying, storage
or use of the information contained in this e-mail or any
attachments is strictly prohibited and may be unlawful.

###########################################
CONFIDENTIALITY: This e-mail and any attachments are confidential and may also be privileged.
If you are not the designated recipient, please notify the sender immediately by reply e-mail and destroy all copies (digital and paper).
Any unauthorized disclosure, distribution, copying, storage or use of the information contained in this e-mail or any attachments is strictly prohibited and may be unlawful.

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@sip-communicator.dev.java.net
For additional commands, e-mail: dev-help@sip-communicator.dev.java.net

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@sip-communicator.dev.java.net
For additional commands, e-mail: dev-help@sip-communicator.dev.java.net


#4

Hi all,

Correct me if I'm wrong but I think that what Ralph wanted to say (and I'm talking about it because I'm also wonderring this) is: can't we just merge the alpha 2 branch in the trunk ? This will allow us to not have to find any modification done in the alpha 2 branch and commit them in the trunk.
Of course if some code from the alpha 2 mustn't be added to the trunk this is not possible but I don't think that it's the case, is it ?

Ben

Romain KUNTZ a �crit :

···

On 2007/11/06, at 15:44, <ralph.weires@hitec.lu> wrote:

I am actually wondering why a new branch has been created for alpha2
anyway. Is there any code in the alpha2 version which is not also
supposed to be put into the trunk for further development? Or is there
another reason for this?

most or all the code for the alpha2 is supposed to be in the trunk, however some code in the trunk was not supposed to be in alpha2, that's why we created a new branch for alpha2. This allows developers to go on committing their ongoing work to the trunk without disturbing the code to be released for alpha2.

Cheers,
romain

-----Original Message-----
From: Romain KUNTZ [mailto:kuntz@clarinet.u-strasbg.fr]
Sent: Monday, November 05, 2007 5:11 PM
To: dev@sip-communicator.dev.java.net
Subject: [sip-comm-dev] Merging alpha2 code to the trunk

Hi devs,

Congratulation for the alpha2 release!
If you committed some code to the alpha2 that should also be
merged to the trunk, don't forget to do it.

Cheers,
Romain

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@sip-communicator.dev.java.net
For additional commands, e-mail:
dev-help@sip-communicator.dev.java.net

###########################################
CONFIDENTIALITY: This e-mail and any attachments are
confidential and may also be privileged.
If you are not the designated recipient, please notify the
sender immediately by reply e-mail and destroy all copies
(digital and paper).
Any unauthorized disclosure, distribution, copying, storage
or use of the information contained in this e-mail or any
attachments is strictly prohibited and may be unlawful.

###########################################
CONFIDENTIALITY: This e-mail and any attachments are confidential and may also be privileged.
If you are not the designated recipient, please notify the sender immediately by reply e-mail and destroy all copies (digital and paper).
Any unauthorized disclosure, distribution, copying, storage or use of the information contained in this e-mail or any attachments is strictly prohibited and may be unlawful.

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@sip-communicator.dev.java.net
For additional commands, e-mail: dev-help@sip-communicator.dev.java.net

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@sip-communicator.dev.java.net
For additional commands, e-mail: dev-help@sip-communicator.dev.java.net

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@sip-communicator.dev.java.net
For additional commands, e-mail: dev-help@sip-communicator.dev.java.net


#5

Hi Ben,

actually, AFAIK, there's no way to do this automatically. Merging the alpha2 with the trunk is made by svn merge, but actually this will merge the branch with your own working copy of the trunk, then you should however resolve all conflicts (if there are any) and commit your work. This is what I've done with my changes to alpha2.

Cheers,
Yana

Benoit Pradelle wrote:

···

Hi all,

Correct me if I'm wrong but I think that what Ralph wanted to say (and I'm talking about it because I'm also wonderring this) is: can't we just merge the alpha 2 branch in the trunk ? This will allow us to not have to find any modification done in the alpha 2 branch and commit them in the trunk.
Of course if some code from the alpha 2 mustn't be added to the trunk this is not possible but I don't think that it's the case, is it ?

Ben

Romain KUNTZ a �crit :

On 2007/11/06, at 15:44, <ralph.weires@hitec.lu> wrote:

I am actually wondering why a new branch has been created for alpha2
anyway. Is there any code in the alpha2 version which is not also
supposed to be put into the trunk for further development? Or is there
another reason for this?

most or all the code for the alpha2 is supposed to be in the trunk, however some code in the trunk was not supposed to be in alpha2, that's why we created a new branch for alpha2. This allows developers to go on committing their ongoing work to the trunk without disturbing the code to be released for alpha2.

Cheers,
romain

-----Original Message-----
From: Romain KUNTZ [mailto:kuntz@clarinet.u-strasbg.fr]
Sent: Monday, November 05, 2007 5:11 PM
To: dev@sip-communicator.dev.java.net
Subject: [sip-comm-dev] Merging alpha2 code to the trunk

Hi devs,

Congratulation for the alpha2 release!
If you committed some code to the alpha2 that should also be
merged to the trunk, don't forget to do it.

Cheers,
Romain

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@sip-communicator.dev.java.net
For additional commands, e-mail:
dev-help@sip-communicator.dev.java.net

###########################################
CONFIDENTIALITY: This e-mail and any attachments are
confidential and may also be privileged.
If you are not the designated recipient, please notify the
sender immediately by reply e-mail and destroy all copies
(digital and paper).
Any unauthorized disclosure, distribution, copying, storage
or use of the information contained in this e-mail or any
attachments is strictly prohibited and may be unlawful.

###########################################
CONFIDENTIALITY: This e-mail and any attachments are confidential and may also be privileged.
If you are not the designated recipient, please notify the sender immediately by reply e-mail and destroy all copies (digital and paper).
Any unauthorized disclosure, distribution, copying, storage or use of the information contained in this e-mail or any attachments is strictly prohibited and may be unlawful.

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@sip-communicator.dev.java.net
For additional commands, e-mail: dev-help@sip-communicator.dev.java.net

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@sip-communicator.dev.java.net
For additional commands, e-mail: dev-help@sip-communicator.dev.java.net

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@sip-communicator.dev.java.net
For additional commands, e-mail: dev-help@sip-communicator.dev.java.net

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@sip-communicator.dev.java.net
For additional commands, e-mail: dev-help@sip-communicator.dev.java.net