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

[Monotone-commits-diffs] Revision b2f0ab790ae1d124361edbbe4a60e728566a50

From: monotone
Subject: [Monotone-commits-diffs] Revision b2f0ab790ae1d124361edbbe4a60e728566a5039
Date: Wed, 12 Aug 2009 17:51:48 +0200 
-----------------------------------------------------------------
Revision: b2f0ab790ae1d124361edbbe4a60e728566a5039
Ancestor: fd2c1878098b47438dd3fdba59de96c2c1ac8776
Author: address@hidden
Date: 2009-08-11T18:37:55
Branch: net.venge.monotone

Modified files:
        tests/move_conflicting_unversioned/__driver__.lua work.cc

ChangeLog: 

--move-conflicting-paths: allow existing _MTN/resolutions directory.

* work.cc (move_conflicting_paths_into_bookkeeping):
* tests/move_conflicting_unversioned/__driver__.lua: allow existing
  _MTN/resolutions directory.

Attachment: txtpbNGD12w8o.txt
Description: Diff [fd2c1878098b47438dd3fdba59de96c2c1ac8776] -> [b2f0ab790ae1d124361edbbe4a60e728566a5039]

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