[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Monotone-commits-nodiffs] Revision 55bd9681bc3dd66910847109b449c3fd36b1
From: |
monotone |
Subject: |
[Monotone-commits-nodiffs] Revision 55bd9681bc3dd66910847109b449c3fd36b1a1a5 |
Date: |
Wed, 12 Jul 2006 04:08:49 +0200 |
-----------------------------------------------------------------
Revision: 55bd9681bc3dd66910847109b449c3fd36b1a1a5
Ancestor: 5bb9142d2928524904e0e9e004dccbe80b1302a3
Author: address@hidden
Date: 2006-07-12T01:30:07
Branch: net.venge.monotone.multihead
Modified files:
ChangeLog cmd_merging.cc
ChangeLog:
* cmd_merging.cc (merge_two): New function.
(CMD(merge)): Rewrite again - only merge one pair of heads on each
pass. Also, skip all the work of finding a good choice if there
are only two heads. Use merge_two.
(CMD(explicit_merge)): Use merge_two.
monotone --db={your.database} diff
--revision=5bb9142d2928524904e0e9e004dccbe80b1302a3
--revision=55bd9681bc3dd66910847109b449c3fd36b1a1a5
----------------------------------------------------------------------
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Monotone-commits-nodiffs] Revision 55bd9681bc3dd66910847109b449c3fd36b1a1a5,
monotone <=