/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/bzrbashprompt.sh

  • 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/bzrbashprompt.sh
 
1
# modify PS1 to your preference and include this file in your bashrc
 
2
# or copy to /etc/bash_completions.d.
 
3
 
 
4
function __prompt_bzr()
 
5
{
 
6
        local revno nick;
 
7
        revno=$(bzr revno 2>/dev/null) || return
 
8
        nick=$(bzr nick 2>/dev/null) || return
 
9
        echo "[bzr://$revno@$nick]"
 
10
}
 
11
 
 
12
if [ "$PS1" ]; then
 
13
        PS1='\u@\h:$(__prompt_bzr)\W\$ '
 
14
fi