[commits] (vajda) [15297] - fixed bug 10780 (r=grant) (C part)

[commits]

Title: [commits] (vajda) [15297] - fixed bug 10780 (r=grant) (C part)

Revision

15297

Author

vajda

Date

2007-09-05 10:05:58 -0700 (Wed, 05 Sep 2007)

Log Message

- fixed bug 10780 (r=grant) (C part)
(http://bugzilla.osafoundation.org/show_bug.cgi?id=10780)
(undo() needs MERGED bit persisted)
- version 0.7-25

Modified Paths

• trunk/internal/chandlerdb/Makefile
• trunk/internal/chandlerdb/chandlerdb/item/item.h

Diff

Modified: trunk/internal/chandlerdb/Makefile (15296 => 15297)

--- trunk/internal/chandlerdb/Makefile	2007-09-05 17:03:03 UTC (rev 15296)
+++ trunk/internal/chandlerdb/Makefile	2007-09-05 17:05:58 UTC (rev 15297)
@@ -1,5 +1,5 @@
 
-RELVER=0.7-$(BRANCH_REV_PREFIX)24
+RELVER=0.7-$(BRANCH_REV_PREFIX)25
 CHANDLERDB=$(INTERNAL)/chandlerdb
 DB_VER=4.5
 SRC=""

Modified: trunk/internal/chandlerdb/chandlerdb/item/item.h (15296 => 15297)

--- trunk/internal/chandlerdb/chandlerdb/item/item.h	2007-09-05 17:03:03 UTC (rev 15296)
+++ trunk/internal/chandlerdb/chandlerdb/item/item.h	2007-09-05 17:05:58 UTC (rev 15297)
@@ -97,7 +97,7 @@
     VRDIRTY    = VDIRTY | RDIRTY,
     DIRTY      = VDIRTY | RDIRTY | NDIRTY | CDIRTY | KDIRTY,
     SAVEMASK   = (DIRTY | ADIRTY | SYSMONITOR | IDXMONITOR |
-                  NEW | DELETED | P_WATCHED | TOINDEX |
+                  NEW | DELETED | MERGED | P_WATCHED | TOINDEX |
                   SCHEMA | CORESCHEMA | WITHSCHEMA | CONTAINER),
     WATCHED    = P_WATCHED | T_WATCHED,
 };

_______________________________________________
Commits mailing list
Commits@osafoundation.org
http://lists.osafoundation.org/mailman/listinfo/commits