|
From: | Jan Djärv |
Subject: | Re: No commit in vc? |
Date: | Thu, 28 Jan 2010 13:59:56 +0100 |
User-agent: | Thunderbird 2.0.0.23 (X11/20090817) |
Eli Zaretskii skrev:
Date: Thu, 28 Jan 2010 09:09:50 +0100 From: Jan_Djärv <address@hidden> CC: address@hidden File "/usr/lib/python2.6/dist-packages/bzrlib/commit.py", line 339, in commit raise errors.CannotCommitSelectedFileMerge(self.specific_files)CannotCommitSelectedFileMerge: Selected-file commit of merges is not supported yet: files src/xfns.cWhat do the following two commands show in the quickfixes branch (which is where you were working, right?)? bzr info bzr status
% bzr info Repository tree (format: 2a) Location: shared repository: /home/jhd/src/emacs repository branch: . Related branches: parent branch: /home/jhd/src/emacs/trunk % bzr status unknown: cmd upd src/.BAK.xterm.c src/.gdb_history src/tag-files src/xx.el Jan D.
[Prev in Thread] | Current Thread | [Next in Thread] |