problem of partially shelve changes from 1 hunk with editor
Affects | Status | Importance | Assigned to | Milestone | |
---|---|---|---|---|---|
Bazaar |
Confirmed
|
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.h 2010-01-12 11:19:22 +0000
+++ DS1963S_low.h 2010-02-10 14:37:38 +0000
@@ -88,9 +88,12 @@
DS1963S_
} DSLProcessDataC
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __DS1963S_low_h */
+
+extern const CFBlackBox2pClass DSL_BB;
+CFBool DSL_process_data_hi (PCFClosure pctx, PCFMessageBase pmsg );
+CFBool DSL_process_
+
+#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.
Changed in bzr: | |
importance: | Undecided → Low |
status: | New → Confirmed |
tags: | added: shelf |
tags: | added: check-for-breezy |
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.