Simple unsticking with 'bzr shelve' [was: Help me unstick ...]

[Stephen J. Turnbull]

Eli Zaretskii writes:

 > > Is that really true??? If so why does not bazaar protect against this?
 > 
 > It's really easy to get out of this "bad state".  No more complicated
 > than with CVS.

The biggest problem with the bad state is that it is not obvious what
to do about it.  Documentation is needed.

Actually (sorry for not remembering this earlier because it is
TOOWTDI) ...

Just use "bzr shelve".  Suppose the files Alan changed are cc-foo.el
and cc-bar.el, and nothing in the 55 files in the merge touched them.

$ bzr shelve cc-foo.el cc-bar.el
$ bzr resolve --all
$ bzr update                # may not be needed but shouldn't hurt

should DTRT, and now Alan can do "bzr log -n0" and "bzr status" to
check for sanity (yes, Alan, you *can* trust your intuition here), and
if things look OK,

$ bzr unshelve
$ bzr commit -m "Killer feature added to CC Mode!"

and push as appropriate for his branch layout.

See "bzr help shelve" for details and caveats on use of the shelf.