| 2010-02-11 13:52:21 |
Alexander Belchenko |
description |
I have problem shelving part of changes from the single hunk. I've invoked shelve then started editor and removed changes in #ifdef part. Then save the file, but bzr refuse to shelve this changes "No changes to shelve"
C:\work\MyCode\APMoney\ow-stack-sha\ds1963s_low>bzr shelve DS1963S_low.h
--- DS1963S_low.h 2010-01-12 11:19:22 +0000
+++ DS1963S_low.h 2010-02-10 14:37:38 +0000
@@ -88,9 +88,12 @@
DS1963S_l_Fsm_t *fsm;
} DSLProcessDataClosure, *PDSLProcessDataClosure;
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __DS1963S_low_h */
+
+extern const CFBlackBox2pClass DSL_BB;
+CFBool DSL_process_data_hi (PCFClosure pctx, PCFMessageBase pmsg );
+CFBool DSL_process_data_low (PCFClosure pctx, PCFMessageBase pmsg );
+
+#ifdef __cplusplus
+}
+#endif
+#endif /* __DS1963S_low_h */
No changes to shelve.
Note that file was modified as result of pending merge. See attached 3 copies of the relevant part of my file, changed is on disk, old and new is created by shelve itself, new is edited. |
I have problem shelving part of changes from the single hunk. I've invoked shelve then started editor and removed changes in #ifdef part. Then save the file, but bzr refuse to shelve this changes "No changes to shelve"
C:\work\ds1963s_low>bzr shelve DS1963S_low.h
--- DS1963S_low.h 2010-01-12 11:19:22 +0000
+++ DS1963S_low.h 2010-02-10 14:37:38 +0000
@@ -88,9 +88,12 @@
DS1963S_l_Fsm_t *fsm;
} DSLProcessDataClosure, *PDSLProcessDataClosure;
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __DS1963S_low_h */
+
+extern const CFBlackBox2pClass DSL_BB;
+CFBool DSL_process_data_hi (PCFClosure pctx, PCFMessageBase pmsg );
+CFBool DSL_process_data_low (PCFClosure pctx, PCFMessageBase pmsg );
+
+#ifdef __cplusplus
+}
+#endif
+#endif /* __DS1963S_low_h */
No changes to shelve.
Note that file was modified as result of pending merge. See attached 3 copies of the relevant part of my file, changed is on disk, old and new is created by shelve itself, new is edited.
|
|
