# HG changeset patch
# User Oben Sonne <obensonne@googlemail.com>
# Date 1259540034 -3600
#      Mon Nov 30 01:13:54 2009 +0100
# Node ID 6f573af6f3f44407f0ae88ab4cafbd37fa033056
# Parent  344a9c71fa17bea51d829114d16dfda3ff29f27d
Show when in a merge situation

Fixes issue 2

diff --git a/compass.py b/compass.py
--- a/compass.py
+++ b/compass.py
@@ -379,7 +379,10 @@
 
     ### current location ###
     
-    if ni.rev in ri.head_revs:
+    wcparents = repo[None].parents()
+    if len(wcparents) > 1:
+        location = "in a merge (with revision %s)" % wcparents[1].rev()
+    elif ni.rev in ri.head_revs:
         location = "at a head"
     elif ni.rev in ri.bh_revs_ia:
         location = "at an inactive branch head"