[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Monotone-commits-nodiffs] Revision a71b546a834a4ac9561d57e9747e69312c1a
From: |
monotone |
Subject: |
[Monotone-commits-nodiffs] Revision a71b546a834a4ac9561d57e9747e69312c1a6b80 |
Date: |
Sun, 18 Nov 2007 04:15:10 +0100 |
-----------------------------------------------------------------
Revision: a71b546a834a4ac9561d57e9747e69312c1a6b80
Ancestor: 4e54e9a21ffe7a526566f18bf659ef75b65fa870
Author: address@hidden
Date: 2007-11-18T02:37:03
Branch: net.venge.monotone
Added files:
tests/merge((patch_a),_(drop_a))/__driver__.lua
Added directories:
tests/merge((patch_a),_(drop_a))
Modified files:
NEWS roster_merge.cc
ChangeLog:
* NEWS: Add a warning when files have been changed on one side of a merge and
deleted on the other.
* roster_merge.cc : insert_if_unborn() : If the file is NOT unborn, and
hence will not appear in the merged revision, then check to see if
any content marks were born after the branch. If they were then print
a warning.
* tests/merge((patch_a),_(drop_a)) : Add a test for the new functionality.
monotone --db={your.database} diff
--revision=4e54e9a21ffe7a526566f18bf659ef75b65fa870
--revision=a71b546a834a4ac9561d57e9747e69312c1a6b80
----------------------------------------------------------------------
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Monotone-commits-nodiffs] Revision a71b546a834a4ac9561d57e9747e69312c1a6b80,
monotone <=