problem of partially shelve changes from 1 hunk with editor

Bug #520461 reported by Alexander Belchenko on 2010-02-11
16
This bug affects 3 people
Affects Status Importance Assigned to Milestone
Bazaar
Medium
Unassigned

Bug 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\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.

Alexander Belchenko (bialix) wrote :
description: updated
John A Meinel (jameinel) on 2010-02-11
Changed in bzr:
importance: Undecided → Low
status: New → Confirmed
tags: added: shelf
Gordon Tyler (doxxx) wrote :

This makes the change editor option nigh useless, since its prime purpose is to allow editing of shelved changes at a finer granularity than the hunks provided by the default command-line interface.

Changed in bzr:
importance: Low → Medium
Jelmer Vernooij (jelmer) on 2017-11-09
tags: added: check-for-breezy
To post a comment you must log in.
This report contains Public information  Edit
Everyone can see this information.

Other bug subscribers

Bug attachments