Changes between Version 6 and Version 7 of TwoWaySync
- Timestamp:
- 12/13/05 17:42:40 (7 years ago)
Legend:
- Unmodified
- Added
- Removed
- Modified
-
TwoWaySync
v6 v7 51 51 1. Run {{{CLEANUP()}}} 52 52 53 2. Use tailor in the DS directory to translate the next patch from darcs to SVN. This will pull the next patch from DO into DSd and create a new revision in DSs and attempt to commit it to SO. The newly created SVN revision will have a special line appended to its log entry saying "This patch originally recorded in darcs and translated into SVN by TAILOR brand revision control translator.". If there are no more untranslated patches in DO then raise StopIteration. If the attempt to commit the new patch to SO fails (which it will if there is a merge conflict) then raise MergeConflict.53 2. Use tailor in the DS directory to translate the next patch from darcs to SVN. This will pull the next patch from DO into DSd and create a new revision in DSs and attempt to commit it to SO. The newly created SVN revision will have a special line appended to its log entry saying "This patch originally recorded in darcs and translated into SVN by TAILOR brand patch wrangler.". If there are no more untranslated patches in DO then raise StopIteration. If the attempt to commit the new patch to SO fails (which it will if there is a merge conflict) then raise MergeConflict. 54 54 55 55 .. _algorithm c:
