[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: No commit in vc?

From: Óscar Fuentes
Subject: Re: No commit in vc?
Date: Thu, 28 Jan 2010 14:43:24 +0100
User-agent: Gnus/5.13 (Gnus v5.13) Emacs/23.1.91 (gnu/linux)

Jason Rumney <address@hidden> writes:

> The same happened to me yesterday.  My sequence was
> Edit in local branch, as recommended. Commit.
> In trunk:
> bzr update
> bzr merge ../branch
> From Emacs C-x v d
> Mark all edited files. Type v.
> Use vc specialised functions to pull the Changelog into the commit
> message, add an extra one liner at the top.
> C-c C-c
> Bzr complains about single file commits.

When you are committing after `merge', don't mark files in VC-dir. With
the point on the `./' entry of VC-dir, press `v'. This does a bare `bzr
commit', which comprises all changes on the working tree. Apparently,
bzr complains if you ask to commit specific files even when those files
are everything which is pending.

> Really, this needs to be made to work, and the frequent respondants to
> queries such as this need to be less condescending toward the people
> reporting these problems

Uh? Condescending how?

> and admit that the tools need improving to match the workflow expected
> by the users, not the other way around!

I have nothing to admit. I wrote a guide for working with bzr on a way
that is very similar to CVS, so people that just want to contribute with
the minimal hassle can keep doing it. I'm not affiliated to Bazaar or
Canonical in any way. I'm just trying to help. If you know what's the
"workflow expected by users" (whatever that means) describe it and I'll
try to see what's possible to match it.

I find your claims uncalled-for and almost offensive.

reply via email to

[Prev in Thread] Current Thread [Next in Thread]