monotone-commits-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Monotone-commits-diffs] Revision 7bedf809be5453501c62668a2e00d2a900dc16


From: monotone
Subject: [Monotone-commits-diffs] Revision 7bedf809be5453501c62668a2e00d2a900dc160a
Date: Fri, 9 May 2008 03:51:03 +0200

-----------------------------------------------------------------
Revision: 7bedf809be5453501c62668a2e00d2a900dc160a
Ancestor: 25d76182286bccd52c355d6770414c62065c823b
Author: address@hidden
Date: 2008-05-09T01:46:19
Branch: net.venge.monotone.simple-resurrect

Added files:
        tests/simple_resurrect/__driver__.lua
Added directories:
        tests/simple_resurrect
Modified files:
        NEWS cmd_merging.cc merge.cc merge.hh options_list.hh
        roster.cc roster_merge.cc roster_merge.hh

ChangeLog: 

Add a simple form of dead file resurrection.  It works, but still needs
cleaning up.  Note the #warnings.
  * News: Add a description of the new '--livelivelive' option.
  * roster_merge.cc: Modify insert_if_unborn() to take a boolean arg.
    This argument reverses the normal merge liveness check so that files
    are kept if they exist in either parent.
  * options_list.hh: Add a global '--livelivelive' option.
  * other files: pass the uselivelivelivemerge boolean in from the global
    option to insert_if_unborn().
  * roster.cc: Comment out some invariants that may no longer hold.
  * tests/simple_resurrect: A quick check that we can resurrect files.

Attachment: txt4AHDXmNuLE.txt
Description: Diff [25d76182286bccd52c355d6770414c62065c823b] -> [7bedf809be5453501c62668a2e00d2a900dc160a]


reply via email to

[Prev in Thread] Current Thread [Next in Thread]