/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to contrib/bash/bzr.simple

  • Committer: John Arbash Meinel
  • Date: 2009-04-29 17:02:36 UTC
  • mto: This revision was merged to the branch mainline in revision 4322.
  • Revision ID: john@arbash-meinel.com-20090429170236-v1oe7b235mi73cqs
https://launchpad.net/bugs/328171
Add a per-implementation test that deleting lines conflicts with modifying lines.

At the moment, I don't see a simple way to implement this for LCA merge,
so I'm just marking it as 'expectedFailure'.
However, it works for both Weave merge and for Merge3.
Fixes bug #328171

Show diffs side-by-side

added added

removed removed

Lines of Context:
contrib/bash/bzr.simple
6
6
 
7
7
_bzr_commands() 
8
8
{
9
 
     bzr help commands | grep -v '^   '
 
9
     bzr help commands | sed -r 's/^([-[:alnum:]]*).*/\1/' | grep '^[[:alnum:]]' 
10
10
}
11
11
 
12
12
_bzr()