Re: [Monotone-devel] Forbid a changeset from merging
On 08/16/2013 10:18 AM, Stephen Leake wrote: You could do it manually with the following steps: - generate a diff file containing the changeset. - propagate from local to main Remember that this a) reveals your local changes and b) screws up history (i.e. logs and annotate). I usually keep anything that could be described as local adjustments private and the upstream clean of such adjustments. Regards Markus Wanner ___ Monotone-devel mailing list Monotone-devel@nongnu.org https://lists.nongnu.org/mailman/listinfo/monotone-devel
Re: [Monotone-devel] Forbid a changeset from merging
On Mon, Aug 19, 2013 at 02:48:51PM +0200, Markus Wanner wrote: On 08/16/2013 10:18 AM, Stephen Leake wrote: You could do it manually with the following steps: - generate a diff file containing the changeset. - propagate from local to main Remember that this a) reveals your local changes and b) screws up history (i.e. logs and annotate). I usually keep anything that could be described as local adjustments private and the upstream clean of such adjustments. Exactly why this isn't a great technique. And why I'll conditionally include a local, not-checked-in, file. Even though it'll cause complications with multiple workspaces -- having to copy the local mods separately from checkout. -- hendrik ___ Monotone-devel mailing list Monotone-devel@nongnu.org https://lists.nongnu.org/mailman/listinfo/monotone-devel
[Monotone-devel] hangs during netsync
I did a netsync with an explicit --db= and a --set-default, because the database had moved in the file tree. It hung after telling me there were no revs out, which was probably correct; I think the two databses may well have been previously sync'd. hendrik@notlookedfor:~/dv/lang/algol/a68h2/workspace$ mtn sync --db=/home/hendrik/dv/lang/algol/a68h2/a68h.mtn --set-default mtn: warning: could not unregister workspace from old database '/home/hendrik/dv/lang/a68h2/a68h.mtn' mtn: connecting to 'mtn://a68h.mtn-host.prjek.net' mtn: include pattern '*' mtn: exclude pattern '' mtn: finding items to synchronize: mtn: certificates | keys | revisions mtn: 369 |2 | 123 mtn: bytes in | bytes out | revs in | revs out mtn: 1.0 k | 1.4 k | 0 |0 Of course it also told me it could not unregister my workspace from the old database, which is probably because the database wasn't there any more. It had been moved, along with the source tree, several workspaces, and several other projects, to a new location. Are the databases still OK? -- hendrik ___ Monotone-devel mailing list Monotone-devel@nongnu.org https://lists.nongnu.org/mailman/listinfo/monotone-devel
Re: [Monotone-devel] hangs during netsync
On Mon, Aug 19, 2013 at 02:18:32PM -0400, Hendrik Boom wrote: I did a netsync with an explicit --db= and a --set-default, because the database had moved in the file tree. It hung after telling me there were no revs out, which was probably correct; I think the two databses may well have been previously sync'd. hendrik@notlookedfor:~/dv/lang/algol/a68h2/workspace$ mtn sync --db=/home/hendrik/dv/lang/algol/a68h2/a68h.mtn --set-default mtn: warning: could not unregister workspace from old database '/home/hendrik/dv/lang/a68h2/a68h.mtn' mtn: connecting to 'mtn://a68h.mtn-host.prjek.net' mtn: include pattern '*' mtn: exclude pattern '' mtn: finding items to synchronize: mtn: certificates | keys | revisions mtn: 369 |2 | 123 mtn: bytes in | bytes out | revs in | revs out mtn: 1.0 k | 1.4 k | 0 |0 It stayed hung for hours. Eventually I control-C'd out of it. The database file name had been updated (I peeked inside _MTN). A subsequent sync worked fine. I can no longer repeat the operation to test potential patches, if it is a bug instead some weird network glitch. It does appear that no data were harmed in the course of this problem. -- hendrik Of course it also told me it could not unregister my workspace from the old database, which is probably because the database wasn't there any more. It had been moved, along with the source tree, several workspaces, and several other projects, to a new location. Are the databases still OK? -- hendrik ___ Monotone-devel mailing list Monotone-devel@nongnu.org https://lists.nongnu.org/mailman/listinfo/monotone-devel ___ Monotone-devel mailing list Monotone-devel@nongnu.org https://lists.nongnu.org/mailman/listinfo/monotone-devel
