[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Monotone-commits-nodiffs] Revision 4994e5e9e6b10252c1652385eb6144e8b838
From: |
monotone |
Subject: |
[Monotone-commits-nodiffs] Revision 4994e5e9e6b10252c1652385eb6144e8b8389725 |
Date: |
Tue, 9 Aug 2005 05:04:38 UT |
-----------------------------------------------------------------
Revision: 4994e5e9e6b10252c1652385eb6144e8b8389725
Ancestor: eadbbd7560987dc42c46b4f9a893fa93df96bcc7
Author: address@hidden
Date: 2005-08-09T02:57:56
Branch: net.venge.monotone
Added files:
tests/t_merge_lca.at
Modified files:
ChangeLog app_state.cc app_state.hh commands.cc monotone.cc
monotone.texi netsync.cc options.hh revision.cc testsuite.at
ChangeLog:
2005-08-08 Nathaniel Smith <address@hidden>
* commands.cc (merge, propagate): Take --lca.
* options.hh: Add OPT_LCA.
* monotone.cc (coptions, cpp_main): Support it it.
* app_state.{hh,cc} (app_state::usa_lca): New variable.
* revision.cc (find_common_ancestor_for_merge): Use LCA if user
passed --lca.
* tests/t_merge_lca.at: New test.
* testsuite.at: Add it.
* monotone.texi (Tree): Document --lca.
monotone --db={your.database} diff
--revision=eadbbd7560987dc42c46b4f9a893fa93df96bcc7
--revision=4994e5e9e6b10252c1652385eb6144e8b8389725
----------------------------------------------------------------------
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Monotone-commits-nodiffs] Revision 4994e5e9e6b10252c1652385eb6144e8b8389725,
monotone <=