Mercurial > hg > classical

changeset 38:ac956912fcdf

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* More things related to merging composers
author Chris Cannam
date Wed, 31 Mar 2010 14:18:56 +0100
parents a8ab8c08a668
children 94cdfacc4910
files common/Objects.cpp utilities/composer/merges-to-do
diffstat 2 files changed, 42 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/common/Objects.cpp	Tue Mar 30 18:12:35 2010 +0100
+++ b/common/Objects.cpp	Wed Mar 31 14:18:56 2010 +0100
@@ -643,11 +643,15 @@
     m_otherURIs.unite(c->otherURIs());
 
     foreach (Document *d, c->pages()) {
+/*
         Document *dd = new Document;
         dd->setUri(d->uri());
-        dd->setSiteName(dd->siteName());
+        dd->setSiteName(d->siteName());
         dd->setTopic(this);
         m_pages.insert(dd);
+*/
+        d->setTopic(this);
+        m_pages.insert(d);
     }
     
     if (m_period == "") m_period = c->period();
--- a/utilities/composer/merges-to-do	Tue Mar 30 18:12:35 2010 +0100
+++ b/utilities/composer/merges-to-do	Wed Mar 31 14:18:56 2010 +0100
@@ -13,3 +13,40 @@
 ./merge.sh http://dbtune.org/classical/resource/composer/nrholm_ib__2 http://dbtune.org/classical/resource/composer/nrholm_ib
 ./merge.sh http://dbtune.org/classical/resource/composer/onslow_george http://dbtune.org/classical/resource/composer/onslow_georges_louis 
 ./merge.sh http://dbtune.org/classical/resource/composer/praetorius_michael http://dbtune.org/classical/resource/composer/praetorius_micheal
+
+  ./merge.sh http://dbtune.org/classical/resource/composer/schenck_johannes http://dbtune.org/classical/resource/composer/schenck_johann
+  ./merge.sh http://dbtune.org/classical/resource/composer/sandrin_pierre http://dbtune.org/classical/resource/composer/sandrin
+  ./merge.sh http://dbtune.org/classical/resource/composer/schumann_clara_wieck http://dbtune.org/classical/resource/composer/schumann_clara
+  ./merge.sh http://dbtune.org/classical/resource/composer/schutt_eduard http://dbtune.org/classical/resource/composer/schutt_eduard__2
+  ./merge.sh http://dbtune.org/classical/resource/composer/semionov_viacheslav http://dbtune.org/classical/resource/composer/semyonow_wjatseslaw
+  ./merge.sh http://dbtune.org/classical/resource/composer/shelbye_william http://dbtune.org/classical/resource/composer/shelby_william
+  ./merge.sh http://dbtune.org/classical/resource/composer/simpson_daniel_leo http://dbtune.org/classical/resource/composer/simpson_daniel_leo__2
+  ./merge.sh http://dbtune.org/classical/resource/composer/skalkottas_nikos http://dbtune.org/classical/resource/composer/skalkottas_nikolaos
+  ./merge.sh http://dbtune.org/classical/resource/composer/slaney_ivor http://dbtune.org/classical/resource/composer/slaney_ivor__2
+  ./merge.sh http://dbtune.org/classical/resource/composer/skrowaczewski_stanisaw http://dbtune.org/classical/resource/composer/skrowaczewski_stanislaw
+  ./merge.sh http://dbtune.org/classical/resource/composer/taverner_john http://dbtune.org/classical/resource/composer/taverner_sir_john
+  ./merge.sh http://dbtune.org/classical/resource/composer/stankovich_yevgeny http://dbtune.org/classical/resource/composer/stankovitch_yevhen
+  ./merge.sh http://dbtune.org/classical/resource/composer/tapissier_jean http://dbtune.org/classical/resource/composer/tapissier_johannes
+  ./merge.sh http://dbtune.org/classical/resource/composer/tchaikovsky_pyotr_ilich http://dbtune.org/classical/resource/composer/tchaikovsky_pyotr_ilyich
+  ./merge.sh http://dbtune.org/classical/resource/composer/titelouze_jean http://dbtune.org/classical/resource/composer/titelouze_jehan
+  ./merge.sh http://dbtune.org/classical/resource/composer/veracini_antonio__2 http://dbtune.org/classical/resource/composer/veracini_antonio
+  ./merge.sh http://dbtune.org/classical/resource/composer/biber_heinrich_franz_von http://dbtune.org/classical/resource/composer/biber_heinrich_ignaz_franz_von http://dbtune.org/classical/resource/composer/von_biber_heinrich_ignaz_franz
+  ./merge.sh http://dbtune.org/classical/resource/composer/walter_johann http://dbtune.org/classical/resource/composer/walter_johann__2
+  ./merge.sh  http://dbtune.org/classical/resource/composer/wassenaer_unico_wilhelm_van http://dbtune.org/classical/resource/composer/wassenaer_count_unico_wilhelm_van
+  ./merge.sh http://dbtune.org/classical/resource/composer/weckmann_matthias http://dbtune.org/classical/resource/composer/weckman_matthias
+  ./merge.sh http://dbtune.org/classical/resource/composer/weigl_karl_ignaz http://dbtune.org/classical/resource/composer/weigl_karl
+  ./merge.sh http://dbtune.org/classical/resource/composer/weinberg_mieczysaw http://dbtune.org/classical/resource/composer/weinberg_mieczyslaw_samuilowicz
+  ./merge.sh http://dbtune.org/classical/resource/composer/weinberg_mieczysaw http://dbtune.org/classical/resource/composer/weinberg_moisey
+  ./merge.sh http://dbtune.org/classical/resource/composer/weiss_silvius_leopold http://dbtune.org/classical/resource/composer/weiss_sylvius_leopold
+  ./merge.sh http://dbtune.org/classical/resource/composer/welcher_dan http://dbtune.org/classical/resource/composer/welcher_daniel
+  ./merge.sh http://dbtune.org/classical/resource/composer/wieniawski_henryk http://dbtune.org/classical/resource/composer/wieniawski_henri
+
+  553  ./merge.sh http://dbtune.org/classical/resource/composer/schumann_clara_wieck http://dbtune.org/classical/resource/composer/schumann_clara
+  557  ./merge.sh http://dbtune.org/classical/resource/composer/tyrwhitt_wilson_gerald_hugh http://dbtune.org/classical/resource/composer/berners_lord_gerald_hugh_tyrwhitt_wilson
+  558  ./merge.sh http://dbtune.org/classical/resource/composer/wilson_thomas_brendan http://dbtune.org/classical/resource/composer/wilson_thomas
+  559  ./merge.sh http://dbtune.org/classical/resource/composer/mcewen_john_blackwood http://dbtune.org/classical/resource/composer/mcewan_john_blackwood
+  560  ./merge.sh http://dbtune.org/classical/resource/composer/wood_charles http://dbtune.org/classical/resource/composer/wood_charles__2
+  561  ./merge.sh http://dbtune.org/classical/resource/composer/zarlino_gioseffo http://dbtune.org/classical/resource/composer/zarlino_gioseffe
+  562  ./merge.sh http://dbtune.org/classical/resource/composer/zespedes_juan_garcia_de http://dbtune.org/classical/resource/composer/zespiedes_juan_garcia_de
+  563  ./merge.sh http://dbtune.org/classical/resource/composer/zielenski_mikoaj http://dbtune.org/classical/resource/composer/zielenski_mikolaj
+  564  ./merge.sh http://dbtune.org/classical/resource/composer/zuidam_rob http://dbtune.org/classical/resource/composer/zuidam_robert