[En-Nut-Discussion] devnut_m3n: Merging to trunk, the SVN way

Uwe Bonnes bon at elektron.ikp.physik.tu-darmstadt.de
Wed Mar 21 18:07:02 CET 2012

>>>>> "Ole" == Ole Reinhardt <ole.reinhardt at embedded-it.de> writes:

    Ole> Hi Uwe, First you should only work on the devnut_uwe_cm3integration
    Ole> branch which is then a fresh copy of trunk. There you will merge
    Ole> file by file from devnut_m3n and resolve conflict by conflict.
    >>  So you propose _not_ to go step by step for each branch revision,
    >> but do the merge more on a file by file base! However this will loose
    >> all svn history of the cm3 branch!

    Ole> Why shall we loose the history of the CM3 branch? If you do a merge
    Ole> with

    Ole> svn merge -r x:y file_from_cm3_brach branches/new_trunk_copy_branch

Ah! As you point out here, svn can do a merge on a file by file base. I
didn't know about that option.

    Ole> And after all files are merged, do a single

    Ole> svn ci

    Ole> we won't loose any history, won't we?

It looks like that way we don't loose history!

    Ole> What would be your alternative?

No alternative needed. Only more knowledge about SVN on my side ;-)
Uwe Bonnes                bon at elektron.ikp.physik.tu-darmstadt.de

Institut fuer Kernphysik  Schlossgartenstrasse 9  64289 Darmstadt
--------- Tel. 06151 162516 -------- Fax. 06151 164321 ----------

More information about the En-Nut-Discussion mailing list