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

[Monotone-commits-diffs] Revision 05b9c6cfe418886e6281f5f25c13be7a2a159b

From: monotone
Subject: [Monotone-commits-diffs] Revision 05b9c6cfe418886e6281f5f25c13be7a2a159b71
Date: Tue, 19 Feb 2008 00:05:42 +0100 
-----------------------------------------------------------------
Revision: 05b9c6cfe418886e6281f5f25c13be7a2a159b71
Ancestor: 8ec95708ff8b9f2b43ecb3d83e4d7dbbf4771b2d
Author: address@hidden
Date: 2008-02-16T04:54:25
Branch: net.venge.monotone

Modified files:
        cmd_netsync.cc cmd_ws_commit.cc merge.cc

ChangeLog: 

        * cmd_netsync.cc (clone):
        * cmd_ws_commit.cc (checkout): remove unnecessary use of shared_ptr's
        * merge.cc (resolve_merge_conflicts): only run second merge pass if
        there are remaining conflicts that require user intervention

Attachment: txtpoHFsKDR51.txt
Description: Diff [8ec95708ff8b9f2b43ecb3d83e4d7dbbf4771b2d] -> [05b9c6cfe418886e6281f5f25c13be7a2a159b71]

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