On Mon, May 3, 2010 at 10:32 AM, Will Coleda <[email protected]> wrote: > From > http://svnbook.red-bean.com/nightly/en/svn.branchmerge.basicmerging.html#svn.branchemerge.basicmerging.stayinsync > > Keeping branch in sync with trunk: svn merge ^/trunk > > Merging branch back to trunk: svn merge --reintegrate > ^/branches/my-calc-branch > - at which point you need to delete the branch and start over if you > have more changes related to this feature. > > I think the problem we've been having is partially following the old > school of branching, with specific revisions and no --reintegrate. > > For those of us using straight svn instead of git-svn, we should > probably follow these guidelines; I'm not sure if we need to do > anything in particular to the existing svn:mergeinfo properties. I > suspect we might need to remove them from trunk, but I'm not sure that > it's necessary. > > -- > Will "Coke" Coleda >
FYI, when committing this merge for branches/codestring, I got the following error: Transmitting file data ...........................................................................................................................svn: Commit succeeded, but other errors follow: svn: Error bumping revisions post-commit (details follow): svn: In directory '/Users/coke/sandbox/parrot/runtime/parrot/library/Archive' svn: Error processing command 'committed' in '/Users/coke/sandbox/parrot/runtime/parrot/library/Archive' svn: Error getting 'affected time' for '/Users/coke/sandbox/parrot/runtime/parrot/library/Archive/.svn/text-base/Tar.pir.svn-base' svn: Can't stat '/Users/coke/sandbox/parrot/runtime/parrot/library/Archive/.svn/text-base/Tar.pir.svn-base': No such file or directory At this point, i was unable to do an svn up locally: $ svn up svn: Working copy '.' locked svn: run 'svn cleanup' to remove locks (type 'svn help cleanup' for details) $ svn cleanup svn: In directory 'runtime/parrot/library/Archive' svn: Error processing command 'committed' in 'runtime/parrot/library/Archive' svn: Log command for directory 'TAR.pir' is mislocated $ rm -rf runtime/parrot/library/Archive $ svn up svn: Working copy '.' locked svn: run 'svn cleanup' to remove locks (type 'svn help cleanup' for details) $ svn cleanup svn: In directory 'runtime/parrot/languages' svn: Error processing command 'committed' in 'runtime/parrot/languages' svn: Working copy 'runtime/parrot' locked svn: run 'svn cleanup' to remove locks (type 'svn help cleanup' for details) .. And so on. I eventually had to nuke the checkout from orbit and start over. Thankfully I didn't have any uncommitted changes. Regards. -- Will "Coke" Coleda _______________________________________________ http://lists.parrot.org/mailman/listinfo/parrot-dev
