Keeping your (SVN) trunk in order
For unlucky few of us that still have to deal with subversion every now and then here is a reminder on how to keep your commit records in your trunk up to do date with your branches: First, you may excabercate what commits may be eligable for a merge into your trunk by executing this command: trunk> svn mergeinfo --show-revs eligible branches/BRANCH_NAME . It should result in a list of record entries that you may, thereupon, use for a true merge in case you need the commit for further trunk development or just commit record-only-merge in case the commit became obsolete: trunk> svn merge --record-only -c 123456 branches/BRANCH_NAME Afterwards, don't forget to commit your changes. Record-Only-Merges may look funny at first but will remove the commit record from the list of eligible merges for good :)