fail. recreating the branch leads to the same error:
regardless whether you check out branches/poslen_changes or branches/poslen_changes_old, when you do a svn merge ^/trunk in the root directory, it just tells me: flo@thinkpad:~/muse-svn/plc2$ svn merge ^/trunk/ -- Merging from r2 to r1739 in ».«: C muse2 C muse this is wrong. it shall merge from r1739, not r2. also, there are no conflicts, cannot be, because there were no changes. and especially there cannot be any conflicts for the muse and muse2 directories itself (svn status later says: C muse2: Deleted incoming and deleted locally C muse: Created incoming and created locally) -> i cannot merge any more :(. what's wrong here? tim, did you have similar issues with your branch(es)? greetings flo Am 28.04.2013 00:58, schrieb Florian Jung: > Hi > > just to let you know that i'm getting into working on MusE again: > > the svn update seems to have broken merging branches, at least for the > poslen branch > > real men don't use svn merge, they apply 4MB-patches by hand. (or, let > patch do the work and clean up after patch by hand.) > > this will probably become a horrible mess when merging back (probably > exactly the same as now), but let's hope it will work :) > > > I haven't tested stuff yet, but at least it compiles. Can't be *that* > broken :) > > -- > > UPDATE: i really, really hate SVN. i hope svn will suffer a slow, > painful death (it actually is quite good at being slow and painful anyway.) > > now recreating the branch, my merging attempts failed -.- > > [/update] > > -- > > > My immediate plans are now: > > (this is already done: add subtick-resolution) > > - make 'clone parts' not share EventList pointers any more. Rather keep > redundant data in the memory. Memory is cheap, you know. > (Large audio data still will be cached, redundancy-free.) [1] > - Change the whole process(dataFrom, dataEnd) (sounds like random > access, which is a lie) semantics to getMoreData(howMuch) (sounds > like stream access, which is true) > > that made: > - each wave event will have a private AudioStream object (clones of the > "same" event will have *different* AudioStreams [1] > - These AudioStreams will unite and manage the following components: > - read data from disk, or cache, or whatever > - decode this data, if it was OGG/FLAC or the like > - possibly do sample-rate-conversion > - possibly do time-stretching or pitch-shifting > They will only provide a function like > getMoreData(howManySamples, currentSamplingRate, stretchFactor, pitch) > (currentSamplingRate shall not change upon calls. howManySamples is > the number of samples *returned*. Internally, probably a different > number is fetched (especially when stretching/converting sampl.rates) > - These AudioStreams may cache, do fancy stuff or whatever. The caller > never sees what happens under the hood. > > - add some "original tempo" structure to wave events > > > > if you have urgent feedback about this, please tell me :) > > greetings, > flo > > > > > ------------------------------------------------------------------------------ > Try New Relic Now & We'll Send You this Cool Shirt > New Relic is the only SaaS-based application performance monitoring service > that delivers powerful full stack analytics. Optimize and monitor your > browser, app, & servers with just a few lines of code. Try New Relic > and get this awesome Nerd Life shirt! http://p.sf.net/sfu/newrelic_d2d_apr > > > > _______________________________________________ > Lmuse-developer mailing list > [email protected] > https://lists.sourceforge.net/lists/listinfo/lmuse-developer
signature.asc
Description: OpenPGP digital signature
------------------------------------------------------------------------------ Try New Relic Now & We'll Send You this Cool Shirt New Relic is the only SaaS-based application performance monitoring service that delivers powerful full stack analytics. Optimize and monitor your browser, app, & servers with just a few lines of code. Try New Relic and get this awesome Nerd Life shirt! http://p.sf.net/sfu/newrelic_d2d_apr
_______________________________________________ Lmuse-developer mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/lmuse-developer
