tx :) On Nov 24, 2011, at 1:38 PM, Thorsten.Seitz@deutschebahn.com wrote:
- When the version to be merged into the trunk is on a branch which I already did merge a couple of versions earlier I want to have to see/think about only those changes that are new (i.e. the changes between the version last merged and the current version to be merged and not all changes between the current version to be merged and the trunk version to be merged into)
e.g.
1.0 -> 2.0 -> 3.0 -> 4.0 -> 5.0 -> 6.0 -> 7.0 Trunk \ / / ?? questions asked here \ / / -> 2.1 -> 2.2 -> 2.3 -> 2.4 Branch
The branch version 2.2 has already been merged into trunk version 5.0 some time earlier. Therefore I'd like to merge only the changes between 2.2 and 2.4 into 7.0. I don't know what Pharo does but VisualWorksdisplays all changes between 2.4 and 7.0 while giving additional information about the last common version which is determined to be 2.0 because previous merges are not considered. This forces me to think about how to merge all changes up to version 2.2 once again. We fixed that in our tools, of course (in VW 7.6), offering an additional merge option which only merges the changes since a user selected common version.
Regards Thorsten
Thorsten Seitz Development Center Architekturkonzeption und -entwicklung (T.SVD 32)
DB Systel GmbH Raum 5C.136, Alfred-Herrhausen-Allee 1, 65760 Eschborn Tel. 069 265-48245, intern 955- _________________________________________________________________________________
Der DB-Konzern im Internet >> http://www.deutschebahn.com
Sitz der Gesellschaft: Frankfurt am Main Registergericht: Frankfurt am Main, HRB 78707 USt-IdNr.: DE252204770 Geschäftsführer: Detlef Exner (Vorsitzender), Dr. Burkhard Klanke, Dr. Klaus Rüffler Vorsitzender des Aufsichtsrates: Dr. Rolf Kranüchel
|------------> | Von: | |------------>
--------------------------------------------------------------------------------------------------------------------------------------------------| |Stéphane Ducasse <stephane.ducasse@inria.fr> | --------------------------------------------------------------------------------------------------------------------------------------------------| |------------> | An: | |------------> --------------------------------------------------------------------------------------------------------------------------------------------------| |ESUG Members <esug-list@lists.esug.org> | --------------------------------------------------------------------------------------------------------------------------------------------------| |------------> | Datum: | |------------> --------------------------------------------------------------------------------------------------------------------------------------------------| |23.11.2011 16:58 | --------------------------------------------------------------------------------------------------------------------------------------------------| |------------> | Betreff: | |------------> --------------------------------------------------------------------------------------------------------------------------------------------------| |[Esug-list] Call for your input on questions you ask yourselves during merge | --------------------------------------------------------------------------------------------------------------------------------------------------| |------------> | Gesendet | | von: | |------------> --------------------------------------------------------------------------------------------------------------------------------------------------| |esug-list-bounces@lists.esug.org | --------------------------------------------------------------------------------------------------------------------------------------------------|
Hi guys
We are writing some articles on the work of veronica to support merging activities. We need your input great smalltalk community :) What are the questions that you ask yourselves when you are/want to merge some code in your project? We would like to do a compilation of questions and also evaluate how the solution of veronica solves them or part of them.
Here are some typical questions we asked ourselves. - What other changes did this change require? - Can I integrate this change right now? - How large it is? - Who made it? - Is it still valid (when I'm working on an old change)? - Is this change impacted by a change that happened in another branch of my software?
Stef D., Andy K. and Veronica U.
_______________________________________________ Esug-list mailing list Esug-list@lists.esug.org http://lists.esug.org/mailman/listinfo/esug-list_lists.esug.org