SVN working notes

Merging dcc_group -> users

Before merging make sure that all your work is commited to the server. Also make sure that all the changes in qchem_group are already merged in qchem_user. Any conflict that may appear is better handled from the qchem_usr branch

svn commit -m "status before merge"   (or using CLion)

Then, changes in dcc_group branch can be merged to user branches in usual way:

svn merge ^/branches/dcc_group    (or using CLion)

If any issues appear during this process check troubleshooting section.

Merging users -> dcc_group

Changes from user branches to dcc_group, should be done using the following procedure in order to keep the branch alive and avoid future “duplicate commit” conflicts:

  1. Merge to dcc_group using reintegrate option:

    svn merge --reintegrate ^/branches/user           [At dcc_group branch]

  2. Commit the merged version:

    svn commit -m "merged from user"                 [At dcc_group branch]

  3. Check the revision number of the commit associated to the merge:

    Committed revision XXX.

  4. Merge this specific revision only using record-only (http://svnbook.red-bean.com/en/1.7/svn.branchmerge.advanced.html) at the user branch using command line:

    svn update
svn merge --record-only -c XXX ^/branches/dcc_group   [At user branch]

  5. Commit merged revision at the user branch:

    svn commit -m "merged record"                         [At user branch]

After this procedure dcc_group can be updated and modified and the changes can be merged into user branches as usual.

Merge trunk -> dcc_group

To merg from trunk to group make sure that you are in dcc_group branch, then execute:

svn merge --accept=postpone ^/trunk

Sometimes after a big merge some connection issues may apear:

svn: E120106: ra_serf: The server sent a trunkated HTTP response body

To fix it just cleanup and try again merge:

svn cleanup
svn up

Make sure to resolve all conflix that may apear:

svn resolve

You can check that everything is Ok by:

svn status

In case conficts appear

C    gvbman/ccvb/ccvb.C
C    gvbman/ccvb/ccvb.h
C    gvbman/ccvb/ccvbAmpConstTsoIter.C

They may be one of two types (Text conflicts or Tree conflicts)

Summary of conflicts:
  Text conflicts: 1
  Tree conflicts: 229

Text conflicts are related to incompatible modifications of the same file between original and incoming merge. Those can be solved by editing the file and searching for ‘<<<<<’ which indicates the conflict block

<<<<<<< .working
LOGICAL   Hole, Part, RasNato, RASPT2, RasDFT, srDFT
=======
LOGICAL   Hole, Part, RasNato, RASPT2, RasDFT, srDFT, DoFED
>>>>>>> .merge-right.r32150

In this block it is shown the two incompatible modifications separated by a ‘====’. ‘>>>>>>’ indicates the end of the block. There is different options of how to proceed. The easiest way is to decide which one of the versions to keep. In case of wanting to keep the original local file you can use

svn resolve —accept=mine-full  file_in_conflict

in case of wanting to keep the incoming merge file

svn resolve —accept=theirs-full  file_in_conflict

Using these comands, SVN will remove the merge marks (‘>>>’, ‘===’ & ‘<<<<’) and keep the chosen version.

In case of wanting to combine the changes, edit the file (by removing ‘<<<<’, ‘===’, ‘>>>>’ marks) and once the file is clean and acceptable

svn resolve —accept=working  file_in_conflict

Merging dcc_group -> trunk

Merging from dcc_group to trunk branches should be done carefully using the queue system

  1. Make sure that qcc_group branch contains all the changes from trunk (see Merge trunk -> dcc_group section)

  2. Use Qchem queue systems (check qchem dev wiki) to merge dcc_group into trunk

After merge from dcc_group branch to trunk using the queue system, dcc_group branch will be deleted automatically. dcc_group should be recreated from trunk:

svn copy ^/trunk  ^/branches/dcc_group -m "recreate dcc_group branch"

Already checkout local directories (from dcc_group branch) should still work normally and can be updated as usual using:

svn update

User branches should merge changes from recreated dcc_group!!! If troubles appear with duplicated commited files appear, they can be resolved by using:

svn resolve —accept=working  file_in_conflict

Tree conflicts can be more tricky and thei are produced due a removal or movement of files and directories that are not properly understood by SVN. A simple way to resolve them is by checking the end result of the conflict. If the files are in the state it should be (the files/directories that should be removed are removed, and the files/directories that should be created are created) then simply mark them as correct:

svn resolve —accept=working  file_or_dir_in_conflict

if not, edit the file/directory structure using the svn commands (svn rm, svn mv, svn cp) and finaly mark them as correct:

svn resolve —accept=working  file_or_dir_in_conflict

Troubleshooting

Deleting or renaming a file or directory in the repository should be handled carefully. Use SVN commands for this. When working with CLion, you can use the graphical interface to browse through the SVN menus to find the delete/rename option.

Deleting a renaming files in your local copy may result in “tree conflicts” during the merge process (even after committing). To solve these conflicts make sure that your local copy contains all the changes that you want to keep and type (from the command line from your work directory):

svn resolve --accept working -R .

Then proceed to commit the changes and update.

SVN scheme

_images/svn_scheme.pdf