>>>>> "Richard" == Richard Levitte <- VMS Whacker <[EMAIL PROTECTED]>> writes:
Richard> Well, one thing that's a bit hard is how to handle
Richard> conflicts in monotone terms. The new
Richard> merge_into_workspace helps, I'll say. I need to make
Richard> some experiments to see how I can back out of such a
Richard> merge, though.
Thats one issue I was wondering about...
I am not sure what merge_into_workspace is, I guess I haven't been
keeping up-to-date...
There are several scenarios for conflicts I can think of:
1. Somebody alters the local working directory used by the server
without committing it. Shouldn't happen, perhaps we can just generate
an error?
2. Two people commit a change from the same server at the same time,
resulting in two heads.
3. One/more people push updates that include multiple heads.
For the initial revision I guess I would be happy if it just tries to
do an "mtn update" and fails if there are multiple heads or local
conflict - this might be confusing though unless it is obvious that
the update failed.
Richard> Eeeep, I didn't pay attention at that time. If anyone
Richard> could point me at that message, or give me a hint at how
Richard> to fid it (subject line, for example), I'd be greatful!
Some here. I meant to keep a copy... I knew it was important at the
time...
Arhh, here is the start of the thread:
http://lists.gnu.org/archive/html/monotone-devel/2006-10/msg00068.html
some of these posts might be worth reading again, even if you read them before.
The message I was referring to is:
http://lists.gnu.org/archive/html/monotone-devel/2006-10/msg00080.html
--
Brian May <[EMAIL PROTECTED]>
_______________________________________________
Monotone-devel mailing list
[email protected]
http://lists.nongnu.org/mailman/listinfo/monotone-devel
