Re: [Monotone-devel] hangs during netsync

2013-08-19 Thread Hendrik Boom
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

[Monotone-devel] hangs during netsync

2013-08-19 Thread Hendrik Boom
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/wo

Re: [Monotone-devel] Forbid a changeset from merging

2013-08-19 Thread Hendrik Boom
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 y

Re: [Monotone-devel] Forbid a changeset from merging

2013-08-19 Thread Markus Wanner
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