Zack Weinberg wrote:
> On 9/23/07, Derek Scherger <[EMAIL PROTECTED]> wrote:
>> I've been playing around a bit with the rather cryptic messages that
>> monotone generates on so called non-content conflicts and hopefully have
>> improved things a bit.
>
> Cool! Your revisions are definitely better
Zack Weinberg wrote:
> Cool! Your revisions are definitely better than what we had, but I
> think they could be even better still.
What? Impossible! ;)
> The term 'node' is only clear if you're familiar with monotone
> internals. I'd suggest checking what kind of node it is and
> substituting '
"Zack Weinberg" <[EMAIL PROTECTED]> writes:
> On 9/23/07, Derek Scherger <[EMAIL PROTECTED]> wrote:
>> I've been playing around a bit with the rather cryptic messages that
>> monotone generates on so called non-content conflicts and hopefully have
>> improved things a bit.
>
> Cool! Your revision
On Sun, Sep 23, 2007 at 09:22:11PM -0700, Zack Weinberg wrote:
> [much good discussion]
>
> > The other thing we should do is add a more detailed section on conflicts
> > to the manual that lists all of these with some hints on how they occur
> > and what to do about them. I'll probably make a fir
On 9/23/07, Derek Scherger <[EMAIL PROTECTED]> wrote:
> I've been playing around a bit with the rather cryptic messages that
> monotone generates on so called non-content conflicts and hopefully have
> improved things a bit.
Cool! Your revisions are definitely better than what we had, but I
think
I've been playing around a bit with the rather cryptic messages that
monotone generates on so called non-content conflicts and hopefully have
improved things a bit.
Here are sample messages from before/after the changes I have pending
for each type of non-content conflict. Please let me know if yo
Richard Levitte - VMS Whacker wrote:
In message <[EMAIL PROTECTED]> on Sun, 27 Aug 2006 09:27:22 +0200 (CEST), Richard
Levitte - VMS Whacker <[EMAIL PROTECTED]> said:
I've figured out what happened, btw. This is part of my build if
snapshot Debian packages, and to do those, I propagate nvm, nv
In message <[EMAIL PROTECTED]> on Sun, 27 Aug 2006 09:27:22 +0200 (CEST),
Richard Levitte - VMS Whacker <[EMAIL PROTECTED]> said:
richard> Hi,
richard>
richard> I've gotten into one of those dreaded non-content conflicts:
richard>
richard> mtn: warning: rename target conflict: nodes 4684, 322
Hi,
I've gotten into one of those dreaded non-content conflicts:
mtn: warning: rename target conflict: nodes 4684, 3223, both want parent
1296, name examples
mtn: warning: resolve non-content conflicts and then try again.
I would appreciate it if someone could remind me how to deal with
tho
