monotone-commits-diffs
[Top][All Lists]
Advanced
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Monotone-commits-diffs] Revision 1a8afa25119c9c88dfd031c7fd834f6f99507e

From: monotone
Subject: [Monotone-commits-diffs] Revision 1a8afa25119c9c88dfd031c7fd834f6f99507ecf
Date: Sun, 11 Jan 2009 19:06:03 +0100 
-----------------------------------------------------------------
Revision: 1a8afa25119c9c88dfd031c7fd834f6f99507ecf
Ancestor: 821bdbb6e7dccef5f2565788534566306f400601
Author: Timothy Brownawell  <address@hidden>
Date: 2009-01-11T18:00:26
Branch: net.venge.monotone

Modified files:
        cmd_merging.cc
        tests/noop_merge_into_workspace/__driver__.lua

ChangeLog: 

Make merge_into_workspace complain instead of exploding when asked to merge in 
an ancestor/descendant.

Attachment: txtfthsfZcl0s.txt
Description: Diff [821bdbb6e7dccef5f2565788534566306f400601] -> [1a8afa25119c9c88dfd031c7fd834f6f99507ecf]

reply via email to
[Prev in Thread] Current Thread [Next in Thread]