archive-com.com » COM » O » ORCAWARE.COM

Total: 284

Choose link from "Titles, links and description words view":

Or switch to "Titles and links view".
  • Revision history of "Svnmerge.py" - SubversionWiki
    MarkieB Talk contribs 20 512 bytes 392 Development branches directory nav could break svnmerge without it cur prev 05 08 17 December 2008 MichaelRWolf Talk contribs 20 120 bytes 224 Note to see Subversion 1 5 release notes for new merge tracking features cur prev 08 27 9 December 2008 Aaronoliver Talk contribs m 19 896 bytes 3 slight fix to grammar cur prev 20 23 29 May 2008 Gregmac Talk contribs 19 899 bytes 106 add svnmergegui cur prev 21 16 3 May 2008 David resnick Talk contribs m 19 793 bytes 0 Quick Usage Overview cur prev 14 56 16 March 2008 Giovannibajo Talk contribs 19 793 bytes 44 cur prev 11 41 16 March 2008 Bewst Talk contribs 19 749 bytes 67 Development branches cur prev 09 17 24 January 2008 Lord you know who Talk contribs m 19 682 bytes 6 corrected typo cur prev 11 44 21 January 2008 Pphaneuf Talk contribs m 19 688 bytes 1 Merging development branches back to trunk fixed a typo cur prev 04 00 6 December 2007 Romulo A Ceccon Talk contribs 19 687 bytes 29 FAQ gmane attachments are not available anymore relinked article to nabble archives cur prev 03 45 6 December 2007 Romulo A Ceccon Talk contribs 19 658 bytes 666 Release branches commiting non ascii messages cur prev 10 52 3 December 2007 Tpatnoe Talk contribs m 18 992 bytes 11 Development branches cur prev 10 52 3 December 2007 Tpatnoe Talk contribs 18 981 bytes 216 Release branches cur prev 10 48 3 December 2007 Tpatnoe Talk contribs 18 765 bytes 355 cur prev 10 41 3 December 2007 Tpatnoe Talk contribs 18 410 bytes 426 Development branches cur prev 11 32 8 November 2007 Dlr Talk contribs 17 984 bytes 304 Add FAQ item about converting from svnmerge py to Subversion 1 5 Merge Tracking cur prev 19 01 4 November 2007 Giovannibajo Talk contribs 17 680 bytes 74 Add e mail for new windows version cur prev 06 53 10 October 2007 Romulo A Ceccon Talk contribs m 17 606 bytes 177 FAQ replaced unreliable tinyurl by actual links cur prev 03 06 15 August 2007 Clange Talk contribs m 17 429 bytes 0 FAQ improved formatting a bit cur prev 10 03 11 July 2007 Blair Talk contribs 17 429 bytes 57 Mailing List Add a link to the orcaware mailing list archives cur prev 21 36 10 July 2007 Dustin Talk contribs 17 372 bytes 1 364 Mailing List archive links Development new section cur prev 04 18 25 June 2007 Servprise Talk contribs 16 008 bytes 1 FAQ cur prev 05 59 2 June 2007 Tobu Talk contribs 16 009 bytes 3 369 Undo revision 1611 by Special Contributions Li User talk Li Spam alert we need rel nofollow cur prev 05 52 2 June 2007 Li Talk contribs 19 378 bytes 3 369 cur prev 14 34 16 March 2007 Aconway Talk contribs 16 009 bytes 160 cur

    Original URL path: https://www.orcaware.com/svn/mediawiki/index.php?title=Svnmerge.py&action=history (2016-04-24)
    Open archived version from archive

  • Svnmerge.py - SubversionWiki
    when Subversion itself is shipped Thus the trunk version is recommended we believe it to be mostly stable there is a quite extensive testsuite Mailing List A svnmerge mailing list has been established The mailing list is the place to go for information about active development and new features List archives are available at OrcaWare GMANE marc info Nabble Development Patches bugfixes and development of svnmerge are all discussed on the mailing list Patches to svnmerge are also tracked using the svnmerge subcomponent on the Subversion bug tracker To submit a patch or bug report please follow the buddy system as described here but use the svnmerge mailing list Quick Usage Overview Use svnmerge init to initialize merge tracking on a branch directory Use svnmerge avail to review the revisions available for merging Use svnmerge merge to merge in some or all available revisions from other branches Commit the merge changes using svn commit Return to step 2 and repeat Quick tutorials What follows are two quick tutorials for two common usage cases Development branches This tutorial assumes that you are working on a recently created development branch made off the trunk It also assumes that the development branch has never merged changes from the trunk The svnmerge py command works as a pull operation so all commands are run from the development branch working copy This example pulls changes made on the trunk to your development branch Go to the top level directory of a pristine working copy of the branch if you re currently in a working copy directory containing trunk you can switch to the branch using svn switch url path to branch This is your development branch svnmerge py is meant to always operate in this condition so let me repeat top level directory no local modifications Initialize merge tracking support svnmerge py init This command will scan the branch history to find out when the branch was created so to initialize merge tracking support This needs to be done only once for each branch you want to use svnmerge py on You should run this command with in the top level directory of the branch otherwise it won t work as expected The svnmerge py init command added a property to the top level directory Since svnmerge py never does a commit it s your turn to commit that change to the repository You can use the handy automatically generated file svn ci F svnmerge commit message txt rm svnmerge commit message txt Or use your favourite commit message It s time to do a merge To merge everything from the trunk into the branch chdir to the top level of the branch and it s sufficient to do foo branch1 svnmerge py merge or without chdir foo svnmerge py merge branch1 and that s it You will always get the svnmerge commit message txt in the current directory Then review the merge fix any eventual conflict and commit There is a handy commit message listing the logs of all the merged revisions can be quite long which many people find useful According to the svn repository it may be necessary to nav into the directory above the working copy of the branch then name the branch in the svnmerge merge command so the sequence of init tracking merge would be for instance path to dir myworkingcopy svnmerge py init path to dir myworkingcopy svn ci F svnmerge commit message txt path to dir myworkingcopy cd path to dir svnmerge py merge myworkingcopy Repeat the last step whenever you want to merge new changes from the trunk If you want to have a look at what new changes are available to be merged from the trunk do this svnmerge py avail show only the revision numbers svnmerge py avail log show logs of the revisions on the trunk available for merging svnmerge py avail diff show diffs of the revisions on the trunk available for merging Release branches This tutorial assumes that you are working on a recently created release branch made off the trunk in which no changes were previously merged With release branch we mean a branch commonly used to stabilize a release only a few selected changes must be merged from the trunk the others must be ignored The svnmerge py command works as a pull operation so all commands are run from the release branch working copy This example pulls selected changes made on the trunk to your release branch Go to the top level directory of a pristine working copy of the branch svn copy trunk release cd release svnmerge py is meant to always operate in this condition so let me repeat top level directory no local modifications Initialize merge tracking support svnmerge py init This command will scan the branch history to find out when the branch was created so to initialize merge tracking support This needs to be done only once for each branch you want to use svnmerge py on svnmerge py never does a commit so it s your turn You can use the handy automatically generated file svn ci F svnmerge commit message txt rm svnmerge commit message txt Or use your favourite commit message Note however that svnmerge py generates the commit message directly from svn client s output so on Windows it ll have an OEM encoding You need to tell that to svn if your log messages contains non ASCII characters otherwise it ll assume an ANSI encoding and the message may be written incorrectly to the repository Then instead of the command above you should use svn ci encoding IBM850 F svnmerge commit message txt rm svnmerge commit message txt To know the current encoding used in the console one can use the chcp command Review changes available on the trunk to be integrated into the branch svnmerge py avail show only the revision numbers svnmerge py avail log show logs of the revisions svnmerge py avail diff show diffs

    Original URL path: https://www.orcaware.com/svn/mediawiki/index.php?title=Svnmerge.py&printable=yes (2016-04-24)
    Open archived version from archive

  • Information for "Svnmerge.py" - SubversionWiki
    users infinite Move Allow all users infinite Edit history Page creator Giovannibajo Talk contribs Date of page creation 09 18 30 May 2006 Latest editor Biewers Talk contribs Date of latest edit 09 03 16 March 2011 Total number of edits 69 Total number of distinct authors 36 Recent number of edits within past 90 days 0 Recent number of distinct authors 0 Retrieved from https www orcaware com svn

    Original URL path: https://www.orcaware.com/svn/mediawiki/index.php?title=Svnmerge.py&action=info (2016-04-24)
    Open archived version from archive

  • Repository Upgrade - SubversionWiki
    some of the formatting options used to navigate repositories Upgrade bat echo off IF NOT 3 goto DoIt cls echo Upgrade existing Subversion repositories echo echo Command line syntax echo Upgrade Source Directory Working Directory Target Directory echo echo Source Directory Where the repositories exist now echo Working Directory Where the dump files should be placed echo Target Directory Where the newly formatted files will be placed echo echo NOTE The upgrade repos bat file is by default using the default echo arguments for svnadmin create echo If you want to use anything else change the file before running goto exit DoIt pushd 1 call the actual upgrade batch file for D I in do call D Scripts upgrade repos bat nI 1 2 3 copy the master files Files in the SVNParent xcopy 1 3 y popd Exit Upgrade Repos bat echo Migrating 1 echo Creating Repository echo 4 1 svnadmin create 4 1 echo Dumping svnadmin dump q 2 1 3 1 dmp echo Loading svnadmin load q 4 1 3 1 dmp echo Copying hooks xcopy 2 1 hooks 4 1 hooks y d echo Retrieved from https www orcaware com svn mediawiki index php title Repository

    Original URL path: https://www.orcaware.com/svn/mediawiki/index.php?title=Repository_Upgrade&oldid=1739 (2016-04-24)
    Open archived version from archive

  • View source for Repository Upgrade - SubversionWiki
    someone gave me another challenge Spaces br Here s the updated script Note it uses commands added in WindowsXP PushD and PopD as well as some of the formatting options used to navigate repositories br Upgrade bat br echo off IF NOT 3 goto DoIt cls echo Upgrade existing Subversion repositories echo echo Command line syntax echo Upgrade Source Directory Working Directory Target Directory echo echo Source Directory Where the repositories exist now echo Working Directory Where the dump files should be placed echo Target Directory Where the newly formatted files will be placed echo echo NOTE The upgrade repos bat file is by default using the default echo arguments for svnadmin create echo If you want to use anything else change the file before running goto exit DoIt pushd 1 call the actual upgrade batch file for D I in do call D Scripts upgrade repos bat nI 1 2 3 copy the master files Files in the SVNParent xcopy 1 3 y popd Exit br br br Upgrade Repos bat br echo Migrating 1 echo Creating Repository echo 4 1 svnadmin create 4 1 echo Dumping svnadmin dump q 2 1 3 1 dmp echo Loading svnadmin load

    Original URL path: https://www.orcaware.com/svn/mediawiki/index.php?title=Repository_Upgrade&action=edit (2016-04-24)
    Open archived version from archive

  • Revision history of "Repository Upgrade" - SubversionWiki
    Talk contribs m 1 649 bytes 18 171 Reverted edits by DarliErc4t Talk changed back to last version by Leo cur prev 21 10 19 February 2008 DarliErc4t Talk contribs m 19 820 bytes 18 171 eltvarbol cur prev 15 30 16 February 2008 Leo Talk contribs 1 649 bytes 9 Undo revision 1713 by Special Contributions DarliErc4t User talk DarliErc4t cur prev 03 57 3 February 2008 DarliErc4t Talk contribs m 1 658 bytes 9 letogetdarro cur prev 16 15 31 December 2007 WikiSysop Talk contribs m 1 649 bytes 10 Reverted edits by BomonRacsi Talk changed back to last version by WikiSysop cur prev 12 54 31 December 2007 BomonRacsi Talk contribs m 1 659 bytes 10 zeldarerrel cur prev 11 13 19 December 2006 WikiSysop Talk contribs m 1 649 bytes 795 Reverted edits by Usnip Talk changed back to last version by NJBrad cur prev 02 40 14 December 2006 Usnip Talk contribs m 2 444 bytes 795 cur prev 10 44 11 September 2006 NJBrad Talk contribs 1 649 bytes 313 cur prev 08 27 11 September 2006 NJBrad Talk contribs 1 336 bytes 2 cur prev 08 22 11 September 2006 NJBrad Talk contribs

    Original URL path: https://www.orcaware.com/svn/mediawiki/index.php?title=Repository_Upgrade&action=history (2016-04-24)
    Open archived version from archive

  • Repository Upgrade - SubversionWiki
    goto DoIt cls echo Upgrade existing Subversion repositories echo echo Command line syntax echo Upgrade Source Directory Working Directory Target Directory echo echo Source Directory Where the repositories exist now echo Working Directory Where the dump files should be placed echo Target Directory Where the newly formatted files will be placed echo echo NOTE The upgrade repos bat file is by default using the default echo arguments for svnadmin create echo If you want to use anything else change the file before running goto exit DoIt pushd 1 call the actual upgrade batch file for D I in do call D Scripts upgrade repos bat nI 1 2 3 copy the master files Files in the SVNParent xcopy 1 3 y popd Exit Upgrade Repos bat echo Migrating 1 echo Creating Repository echo 4 1 svnadmin create 4 1 echo Dumping svnadmin dump q 2 1 3 1 dmp echo Loading svnadmin load q 4 1 3 1 dmp echo Copying hooks xcopy 2 1 hooks 4 1 hooks y d echo Retrieved from https www orcaware com svn mediawiki index php title Repository Upgrade oldid 1739 Navigation menu Personal tools 81 198 240 36 Talk for this IP address

    Original URL path: https://www.orcaware.com/svn/mediawiki/index.php?title=Repository_Upgrade&printable=yes (2016-04-24)
    Open archived version from archive

  • Information for "Repository Upgrade" - SubversionWiki
    users infinite Move Allow all users infinite Edit history Page creator NJBrad Talk contribs Date of page creation 08 18 11 September 2006 Latest editor WikiSysop Talk contribs Date of latest edit 23 26 19 February 2008 Total number of edits 12 Total number of distinct authors 6 Recent number of edits within past 90 days 0 Recent number of distinct authors 0 Retrieved from https www orcaware com svn

    Original URL path: https://www.orcaware.com/svn/mediawiki/index.php?title=Repository_Upgrade&action=info (2016-04-24)
    Open archived version from archive



  •