Re: [Monotone-devel] Vendor branch tricks SVN mirroring
On Thu, Jun 30, 2005 at 06:24:58PM -0400, Eric Kidd wrote: Since monotone doesn't handle directory moves as gracefully as it could, this strategy only works if the 'bar' directory appears in the same place in both the vendor branch and the head branch. Not sure what you mean; monotone does handle directory moves gracefully, as far as I know. Unless you mean that it doesn't handle renaming the root directory, which can be very handy in cases like this (you want the root directory of one project to be some subdirectory in another project). We'll think about it once we get some of the current messes straightened out :-). -- Nathaniel -- /* Tell the world that we're going to be the grim * reaper of innocent orphaned children. */ -- Linux kernel 2.4.5, main.c ___ Monotone-devel mailing list Monotone-devel@nongnu.org http://lists.nongnu.org/mailman/listinfo/monotone-devel
Re: [Monotone-devel] Renaming branches -- where is the script?
On Sat, Jun 25, 2005 at 01:01:44PM -0500, Brian Downing wrote: On Fri, Jun 24, 2005 at 01:15:10PM -0700, Nathaniel Smith wrote: If someone were to fix the b: selector (as described at http://venge.net/monotone/quickies.html, last item), then this would just be $ for R in `monotone automate select b:badbranch` do monotone cert $R branch goodbranch; done ATM though this will not do what you want if there are any branches named badbranchfoo, since b:badbranch will match any branch whose name begins with badbranch. Attached is a quick fix for this. The 'b:' selector is an explicit glob now - b:net.venge.monotone gets only the net.venge.monotone branch, b:*net.venge.monotone* gets the ol behavior. Behavior for the other selectors shouldn't have changed. However, their behavior was not as documented. Most are doing a '*%s*' glob search (b:ge.monotone.gu would find the net.venge.monotone.gui branch), even though the documentation implied that it was a '%s*' search. Could you add docs/tests for this change and re-submit? Hmm, it would probably also make sense for t: and c: to work this way, maybe others too... -- Nathaniel -- Details are all that matters; God dwells there, and you never get to see Him if you don't struggle to get them right. -- Stephen Jay Gould ___ Monotone-devel mailing list Monotone-devel@nongnu.org http://lists.nongnu.org/mailman/listinfo/monotone-devel
Re: [Monotone-devel] Vendor branch tricks SVN mirroring
On 7/1/05, Nathaniel Smith [EMAIL PROTECTED] wrote: Not sure what you mean; monotone does handle directory moves gracefully, as far as I know. My understanding is that if I add directory D1 on branch A, propagate to branch B, and move D1 to D2, that everything will work fine. But without an explicit representation of directories, if I latter add D1/F on branch B and propagate it, it will become D1/F, not D2/F. Or has this been fixed? Cheers, Eric ___ Monotone-devel mailing list Monotone-devel@nongnu.org http://lists.nongnu.org/mailman/listinfo/monotone-devel
[Monotone-devel] Commit while pulling monotone sources
Hello, Don't know if this is really a bug but monotone thinks so. I was pulling the monotone sources like this to host 'vargen': monotone --key= pull off.net net.venge.monotone At the same time I synced some work done on host 'bamse' to the same db as pulling monotone sources to on host 'vargen'. Resulted in this error in the netsync server running on 'vargen': monotone: accepted new client connection from 127.0.0.1:4606 monotone: rebuilding merkle trees for collection net.venge.monotone.contrib monotone: fatal: std::runtime_error: db query [SELECT id, name, value, keypair, signature FROM '%q' WHERE name = '%q']: sqlite error database is locked monotone: this is almost certainly a bug in monotone. monotone: please send this error message, the output of 'monotone --full-version', monotone: and a description of what you were doing to [EMAIL PROTECTED] monotone: discarding debug log (maybe you want --debug or --dump?) vargen -- [EMAIL PROTECTED]:~$ monotone --full-version monotone 0.19 (base revision: 168adf9537ff136c9b7fe7faad5991f92859390d) Running on: Linux 2.6.11.2 #6 Sat Apr 16 23:00:50 CEST 2005 i686 Changes since base revision: new_manifest [52a617d908ac6c4bb5b837ce5306f75155dc59ef] old_revision [168adf9537ff136c9b7fe7faad5991f92859390d] old_manifest [a9ee1d741b855fdcc0d038d64d913cef70da72f5] patch po/monotone.pot from [10e6d7cbad87eaa0dbe35c803cafa371567f024b] to [0465f6ac8d09fac5938ac067747b179aca677b67] Generated from data cached in the distribution; further changes may have been made. Generated from data cached in the distribution; further changes may have been made. Generated from data cached in the distribution; further changes may have been made. bamse - [EMAIL PROTECTED]:~$ monotone --full-version monotone 0.19 (base revision: 168adf9537ff136c9b7fe7faad5991f92859390d) Running on: Linux 2.6.10-5-powerpc #1 Tue Jun 7 10:44:23 UTC 2005 ppc Changes since base revision: new_manifest [52a617d908ac6c4bb5b837ce5306f75155dc59ef] old_revision [168adf9537ff136c9b7fe7faad5991f92859390d] old_manifest [a9ee1d741b855fdcc0d038d64d913cef70da72f5] patch po/monotone.pot from [10e6d7cbad87eaa0dbe35c803cafa371567f024b] to [0465f6ac8d09fac5938ac067747b179aca677b67] Generated from data cached in the distribution; further changes may have been made. Generated from data cached in the distribution; further changes may have been made. Generated from data cached in the distribution; further changes may have been made. Generated from data cached in the distribution; further changes may have been made. Pull status on vargen - [EMAIL PROTECTED]:~$ monotone --db ~/.monotone/johan.db --key= pull off.net net.venge.monotone monotone: warning: doing anonymous pull monotone: connecting to off.net monotone: rebuilding merkle trees for collection net.venge.monotone monotone: including branch net.venge.monotone.contrib.monotree monotone: including branch net.venge.monotone.contrib monotone: [certs: 112] [keys: 1] monotone: [bytes in: 6.4M] [bytes out: 330.1k] [certs in: 9874] [revs in: 3068] monotone: [bytes in: 19.2M] [bytes out: 822.8k] [certs in: 9874] [revs in: 3068] /Johan ___ Monotone-devel mailing list Monotone-devel@nongnu.org http://lists.nongnu.org/mailman/listinfo/monotone-devel
Re: [Monotone-devel] Commit while pulling monotone sources
On Fri, 2005-07-01 at 19:44 +0200, Johan Bolmsjo wrote: Hello, Don't know if this is really a bug but monotone thinks so. No, just a bad error message. I was pulling the monotone sources like this to host 'vargen': monotone --key= pull off.net net.venge.monotone At the same time I synced some work done on host 'bamse' to the same db as pulling monotone sources to on host 'vargen'. That's the problem, only one monotone process can use a database at a time. Resulted in this error in the netsync server running on 'vargen': monotone: accepted new client connection from 127.0.0.1:4606 monotone: rebuilding merkle trees for collection net.venge.monotone.contrib monotone: fatal: std::runtime_error: db query [SELECT id, name, value, keypair, signature FROM '%q' WHERE name = '%q']: sqlite error database is locked monotone: this is almost certainly a bug in monotone. monotone: please send this error message, the output of 'monotone --full-version', monotone: and a description of what you were doing to [EMAIL PROTECTED] monotone: discarding debug log (maybe you want --debug or --dump?) vargen -- [EMAIL PROTECTED]:~$ monotone --full-version monotone 0.19 (base revision: 168adf9537ff136c9b7fe7faad5991f92859390d) Running on: Linux 2.6.11.2 #6 Sat Apr 16 23:00:50 CEST 2005 i686 Changes since base revision: new_manifest [52a617d908ac6c4bb5b837ce5306f75155dc59ef] old_revision [168adf9537ff136c9b7fe7faad5991f92859390d] old_manifest [a9ee1d741b855fdcc0d038d64d913cef70da72f5] patch po/monotone.pot from [10e6d7cbad87eaa0dbe35c803cafa371567f024b] to [0465f6ac8d09fac5938ac067747b179aca677b67] Generated from data cached in the distribution; further changes may have been made. Generated from data cached in the distribution; further changes may have been made. Generated from data cached in the distribution; further changes may have been made. bamse - [EMAIL PROTECTED]:~$ monotone --full-version monotone 0.19 (base revision: 168adf9537ff136c9b7fe7faad5991f92859390d) Running on: Linux 2.6.10-5-powerpc #1 Tue Jun 7 10:44:23 UTC 2005 ppc Changes since base revision: new_manifest [52a617d908ac6c4bb5b837ce5306f75155dc59ef] old_revision [168adf9537ff136c9b7fe7faad5991f92859390d] old_manifest [a9ee1d741b855fdcc0d038d64d913cef70da72f5] patch po/monotone.pot from [10e6d7cbad87eaa0dbe35c803cafa371567f024b] to [0465f6ac8d09fac5938ac067747b179aca677b67] Generated from data cached in the distribution; further changes may have been made. Generated from data cached in the distribution; further changes may have been made. Generated from data cached in the distribution; further changes may have been made. Generated from data cached in the distribution; further changes may have been made. Pull status on vargen - [EMAIL PROTECTED]:~$ monotone --db ~/.monotone/johan.db --key= pull off.net net.venge.monotone monotone: warning: doing anonymous pull monotone: connecting to off.net monotone: rebuilding merkle trees for collection net.venge.monotone monotone: including branch net.venge.monotone.contrib.monotree monotone: including branch net.venge.monotone.contrib monotone: [certs: 112] [keys: 1] monotone: [bytes in: 6.4M] [bytes out: 330.1k] [certs in: 9874] [revs in: 3068] monotone: [bytes in: 19.2M] [bytes out: 822.8k] [certs in: 9874] [revs in: 3068] /Johan ___ Monotone-devel mailing list Monotone-devel@nongnu.org http://lists.nongnu.org/mailman/listinfo/monotone-devel ___ Monotone-devel mailing list Monotone-devel@nongnu.org http://lists.nongnu.org/mailman/listinfo/monotone-devel
Re: [Monotone-devel] Vendor branch tricks SVN mirroring
On Fri, Jul 01, 2005 at 07:59:11AM -0400, Eric Kidd wrote: On 7/1/05, Nathaniel Smith [EMAIL PROTECTED] wrote: Not sure what you mean; monotone does handle directory moves gracefully, as far as I know. My understanding is that if I add directory D1 on branch A, propagate to branch B, and move D1 to D2, that everything will work fine. But without an explicit representation of directories, if I latter add D1/F on branch B and propagate it, it will become D1/F, not D2/F. Or has this been fixed? The no explicit representation of directories thing is a little confusing; it only applies to creating them. (We're fixing this so that we really truly do have explicit representation of directories everywhere, which should remove the confusion...) Your example doesn't need to be fixed, because it has always worked correctly, for as long as we've supported renames at all. -- Nathaniel -- So let us espouse a less contested notion of truth and falsehood, even if it is philosophically debatable (if we listen to philosophers, we must debate everything, and there would be no end to the discussion). -- Serendipities, Umberto Eco ___ Monotone-devel mailing list Monotone-devel@nongnu.org http://lists.nongnu.org/mailman/listinfo/monotone-devel
