bzr shelve: allow splitting hunks into smaller ones

Bug #487730 reported by Marius Gedminas
18
This bug affects 3 people
Affects Status Importance Assigned to Milestone
Bazaar
Confirmed
Medium
Unassigned
BzrTools
Won't Fix
Undecided
Unassigned

Bug Description

Sometimes two unrelated changes are situated close to each other, yet separated by one or more lines of unmodified context. I'd like bzr shelve to allow me the option of splitting the hunk into smaller hunks if possible, so I could shelve those changes separately.

If you've ever used git, 'git add -p' can do this.

Revision history for this message
Aaron Bentley (abentley) wrote :

The bzrtools version of shelve, i.e. shelve1, is in bugfix-only mode. The bzr version of shelve, i.e. shelve2, allows shelving on a finer-than-hunk basis using the shelve_editor and "e" option.

Revision history for this message
Marius Gedminas (mgedmin) wrote :

I was using 'bzr shelve'. Judging from 'bzr help shelve|grep plugin' it's the one from bzr core (since "bzr help shelve1|grep plugin" says it comes form bzrtools). I'll try to reassign it to bzr.

Just a note that my version of "bzr shelve" had no indication it supported anything other than y/n/f/q for each hunk. Do I need to configure something for the 'e' option to become available, or do I need to upgrade bzr? I'm running 2.0.2-1~bazaar1~karmic from the bazaar PPA.

Martin Pool (mbp)
Changed in bzr:
status: New → Confirmed
importance: Undecided → Medium
Jelmer Vernooij (jelmer)
tags: added: shelve
tags: added: shelf
removed: shelve
Aaron Bentley (abentley)
Changed in bzrtools:
status: New → Won't Fix
Jelmer Vernooij (jelmer)
tags: added: check-for-breezy
To post a comment you must log in.
This report contains Public information  
Everyone can see this information.

Other bug subscribers

Remote bug watches

Bug watches keep track of this bug in other bug trackers.