all messages for Emacs-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
* Help me unstick my bzr, please.
@ 2010-01-15 22:27 Alan Mackenzie
  2010-01-16  2:37 ` Giorgos Keramidas
  2010-01-16 10:10 ` Eli Zaretskii
  0 siblings, 2 replies; 23+ messages in thread
From: Alan Mackenzie @ 2010-01-15 22:27 UTC (permalink / raw)
  To: emacs-devel

Hi, Emacs,

I've been struggling with this fine distributed version control system
for over a week now.  My trouble is that I have no mental picture of
what the main bits are in bzr and what the relationships between them
are.  I don't find the bazaar documentation much help in forming such a
mental picture.

Specific problem: I have just fixed a bug in my "quickfixes" branch.
This involved changing a single C file and .../src/ChangeLog.  I
attempt to merge the change into my "trunk" branch by doing this:

    ~/emacs/emacs.bzr/quickfixes$ bzr merge

I get this error message:

    bzr: ERROR: Working tree "/home/acm/emacs/emacs.bzr/quickfixes/" has
    uncommitted changes (See bzr status).

When I execute bzr status, it gives me a list of ~55 allegedly modified
files, finishing up with:

    pending merge tips: (use -v to see all merge revisions)
      Jan D. 2010-01-06 [merge] Fix slowdown and wrong font choosed by XSETTINGS...
      
Would somebody please tell me what I might have done to make bzr think
I've got 55 modified files?  How might I recover from this?

-- 
Alan Mackenzie (Nuremberg, Germany).




^ permalink raw reply	[flat|nested] 23+ messages in thread

end of thread, other threads:[~2010-01-17  7:50 UTC | newest]

Thread overview: 23+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-01-15 22:27 Help me unstick my bzr, please Alan Mackenzie
2010-01-16  2:37 ` Giorgos Keramidas
2010-01-16  7:48   ` Eli Zaretskii
2010-01-16  8:29     ` Stephen J. Turnbull
2010-01-16  8:41     ` Stephen J. Turnbull
2010-01-16  8:59       ` Eli Zaretskii
2010-01-17  6:04         ` Stephen J. Turnbull
2010-01-16  9:02     ` Giorgos Keramidas
2010-01-16  9:57       ` Eli Zaretskii
2010-01-16 10:04         ` Giorgos Keramidas
2010-01-16  9:16     ` Lennart Borgman
2010-01-16  9:53       ` Andreas Schwab
2010-01-16  9:54       ` Eli Zaretskii
2010-01-16  9:59         ` Giorgos Keramidas
2010-01-16 10:02         ` Lennart Borgman
2010-01-16 11:17           ` Eli Zaretskii
2010-01-17  6:23             ` Simple unsticking with 'bzr shelve' [was: Help me unstick ...] Stephen J. Turnbull
2010-01-16 19:36     ` Help me unstick my bzr, please Stefan Monnier
2010-01-16 21:38   ` Alan Mackenzie
2010-01-17  7:50     ` Giorgos Keramidas
2010-01-16 10:10 ` Eli Zaretskii
2010-01-16 21:27   ` Alan Mackenzie
2010-01-16 21:32     ` Juanma Barranquero

Code repositories for project(s) associated with this external index

	https://git.savannah.gnu.org/cgit/emacs.git
	https://git.savannah.gnu.org/cgit/emacs/org-mode.git

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.