[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Monotone-commits-diffs] Revision 9dcf74595a12048481267b897683438c7fa16f
From: |
monotone |
Subject: |
[Monotone-commits-diffs] Revision 9dcf74595a12048481267b897683438c7fa16f4e |
Date: |
Sun, 15 Jun 2008 23:04:44 +0200 |
-----------------------------------------------------------------
Revision: 9dcf74595a12048481267b897683438c7fa16f4e
Ancestor: dd1db0c69651cc5c574371c159e8559bd81c8ca5
Author: address@hidden
Date: 2008-06-15T21:00:33
Branch: net.venge.monotone.automate_show_conflict
Added files:
multi-mark-merge.text ss-existence-merge.text
ss-mark-merge.text unique-mark-merge.text
Modified files:
cmd_merging.cc roster.cc roster.hh roster_merge.cc
tests/resolve_duplicate_name_conflict/__driver__.lua
tests/resolve_duplicate_name_conflict/expected-update-messages-jim_1
ChangeLog:
change update algorithm to support suture; breaks some existing tests.
* cmd_merging.cc (CMD(update)): change algorithm when not switching
branches; allows supporting suture.
* unique-mark-merge.text: New file.
* multi-mark-merge.text: New file.
* ss-existence-merge.text: New file.
* ss-mark-merge.text: New file.
* roster.hh:
* roster.cc (make_working_markings): new.
* roster_merge.cc (roster_merge): fix bug.
* tests/resolve_duplicate_name_conflict/expected-update-messages-jim_1:
* tests/resolve_duplicate_name_conflict/__driver__.lua (abe_thermostat):
Resolve FIXME.
txtOLgABtwBwF.txt
Description: Diff [dd1db0c69651cc5c574371c159e8559bd81c8ca5] -> [9dcf74595a12048481267b897683438c7fa16f4e]
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Monotone-commits-diffs] Revision 9dcf74595a12048481267b897683438c7fa16f4e,
monotone <=