From 4643ac7c6445aa3f853b91dfd66f69a1d9ea1db2 Mon Sep 17 00:00:00 2001
From: Andreas Roehler <andreas.roehler@online.de>
Date: Thu, 28 Jan 2010 16:05:22 +0100
Subject: [PATCH] commit from vc in Emacs

---
 code/bazaar-stuff.el | 47 +++++++++++++++++++++++++++++++++++++++--------
 1 file changed, 39 insertions(+), 8 deletions(-)

diff --git a/code/bazaar-stuff.el b/code/bazaar-stuff.el
index 8bd48fa..f9c8dd3 100644
--- a/code/bazaar-stuff.el
+++ b/code/bazaar-stuff.el
@@ -1,3 +1,42 @@
+* commit from vc in Emacs
+
+> Óscar Fuentes skrev:
+>> Jan Djärv <jan.h.d@swipnet.se> writes:
+>>
+>>> Maybe I'm missing something obvious, but I can't find any way of doing
+>>> commit from vc in Emacs (for bzr).
+>>>
+>>> I did what "Doing Quick Fixes" says in BzrForEmacsDevs.  I then did
+>>> C-x v d ..., and then v, <type comment> C-c C-c.
+>>>
+>>> Bzr then complains it can't do single file commits for merges
+>>> (whatever that means).
+>>
+>> Let me guess:
+>>
+>> bzr merge
+>> <hack hack>
+>> bzr commit foo.c
+>> <cannot do single file commits for merges>
+>
+> No.  I used vc from inside Emacs.  vc did a commit according to
+> .bzr-log.  I never commited a single file.
+
+Well, I was trying to describe on terms of bzr commands what you VC did
+at your request. After reading your other messages, I guess that this is
+what happened:
+
+cd trunk
+bzr merge ../other-branch
+<in VC-dir, mark the modified files>
+<commit from VC-dir>
+
+As mentioned on my response to Jason, it seems that bzr does not admit a
+`commit' comand with a list of files when there is a pending merge. The
+solution for this is to not mark files in VC-dir, but put the point on
+the `./' entry at the top and press `v' there. This commits all changes
+on the current working tree, which keeps bzr happy.
+
 * Emacs available from Launchpad too
 
 From: Lennart Borgman <lennart.borgman@gmail.com>
@@ -15,7 +54,6 @@ On Tue, Jan 26, 2010 at 10:31 PM, henry atting <nsmp_01@online.de> wrote:
 > but stopped, unpatiently, after 20 minutes.
 > Is this the only way to get the latest source?
 
-
 You can get them from Launchpad too. That is faster since they have
 installed the bazaar fast server (or what it is called).
 
@@ -25,10 +63,6 @@ After that updates are quick (in the trunk subdir):
 
   bzr update
 
-
-
-
-
 * merge --uncommitted
 
 On Fri, Jan 8, 2010 at 10:24, Eli Zaretskii <eliz@gnu.org> wrote:
@@ -59,6 +93,3 @@ On Fri, Jan 8, 2010 at 13:31, Eli Zaretskii <eliz@gnu.org> wrote:
 Yes.
 
     Juanma
-
-
-
-- 
2.11.4.GIT