Gary S. Thompson wrote:
Edward d'Auvergne wrote:
Unfortunately you won't be able to use one command to do the update.
The reason is because at r2770 you ported r2768 of the 1.3 line which
was a fix for bug #7641 (https://gna.org/bugs/index.php?7641).
Therefore the bulk porting of r2718 to r2888 will cause r2768 to be
applied to the 'test_suite' branch twice. It would be best, for the
sake of resolving conflicts, to port revisions in small blocks.
ok I follow
Hi Ed we can't use this (our svn is too old) but I thought you might
find it useful /interesting
http://www.orcaware.com/svn/wiki/Svnmerge.py
Features
* *Merge tracking* support: the tool remembers which revisions have
been already merged, and always do the right thing by default
(only merges new revisions).
* Specific support for *development branches* with a very simple
"merge everything" command (does everything automatically).
* Specific support for *release branches* through *cherry-picking*:
name and merge single revisions or revision ranges.
* *List revisions available for merging* (revision numbers, logs, or
diffs).
* *Bidirectional merges*: merges changes forth and back between a
branch and its head.
* *Multiple heads support*: merge changes from multiple sources.
This is useful, for instance, for the trunk, which usually needs
to merge changes from multiple branches.
* *Revision blocking*: mark some revisions as unwanted in the
branch, so that they will never get merged and you can forget
about them.
* *Merge rollbacks*: freely revert merges in case you changed your
mind.
* Absolutely *commit-free*: the user will always have to do the
commit himself, and thus will always have a chance to review
svnmerge.py's modifications.
* *Commit message suggestions*: an informative commit message
listing all the logs of the merged revisions is generated in a
text file, as a suggestion for a good commit message.
* *Manual merges support*: if you merged some changes manually, you
can inform svnmerge.py to update its merge tracking info.
regards
gary
--
-------------------------------------------------------------------
Dr Gary Thompson
Astbury Centre for Structural Molecular Biology,
University of Leeds, Astbury Building,
Leeds, LS2 9JT, West-Yorkshire, UK Tel. +44-113-3433024
email: garyt@xxxxxxxxxxxxxxx Fax +44-113-2331407
-------------------------------------------------------------------
Re: Keeping the 'test_suite' branch in sync.