code/bazaar-stuff.el

   1 * commit from vc in Emacs
   2
   3 > Óscar Fuentes skrev:
   4 >> Jan Djärv <jan.h.d@swipnet.se> writes:
   5 >>
   6 >>> Maybe I'm missing something obvious, but I can't find any way of doing
   7 >>> commit from vc in Emacs (for bzr).
   8 >>>
   9 >>> I did what "Doing Quick Fixes" says in BzrForEmacsDevs.  I then did
  10 >>> C-x v d ..., and then v, <type comment> C-c C-c.
  11 >>>
  12 >>> Bzr then complains it can't do single file commits for merges
  13 >>> (whatever that means).
  14 >>
  15 >> Let me guess:
  16 >>
  17 >> bzr merge
  18 >> <hack hack>
  19 >> bzr commit foo.c
  20 >> <cannot do single file commits for merges>
  21 >
  22 > No.  I used vc from inside Emacs.  vc did a commit according to
  23 > .bzr-log.  I never commited a single file.
  24
  25 Well, I was trying to describe on terms of bzr commands what you VC did
  26 at your request. After reading your other messages, I guess that this is
  27 what happened:
  28
  29 cd trunk
  30 bzr merge ../other-branch
  31 <in VC-dir, mark the modified files>
  32 <commit from VC-dir>
  33
  34 As mentioned on my response to Jason, it seems that bzr does not admit a
  35 `commit' comand with a list of files when there is a pending merge. The
  36 solution for this is to not mark files in VC-dir, but put the point on
  37 the `./' entry at the top and press `v' there. This commits all changes
  38 on the current working tree, which keeps bzr happy.
  39
  40 * Emacs available from Launchpad too
  41
  42 From: Lennart Borgman <lennart.borgman@gmail.com>
  43 Date: Tue, 26 Jan 2010 22:46:47 +0100
  44 To: henry atting <nsmp_01@online.de>
  45 Subject: Re: bazaar question
  46
  47 On Tue, Jan 26, 2010 at 10:31 PM, henry atting <nsmp_01@online.de> wrote:
  48 > I find it annoying that I have to grapple with bazaar if I
  49 > want to go on building emacs from source. Do I really have to pull
  50 > the whole emacs tree starting from the first published sources in the
  51 > Roman Empire?
  52 >
  53 > Tried it with `bazaar branch http://bzr.savannah.gnu.org/r/emacs/trunk/'
  54 > but stopped, unpatiently, after 20 minutes.
  55 > Is this the only way to get the latest source?
  56
  57 You can get them from Launchpad too. That is faster since they have
  58 installed the bazaar fast server (or what it is called).
  59
  60   bzr branch lp:emacs trunk
  61
  62 After that updates are quick (in the trunk subdir):
  63
  64   bzr update
  65
  66 * merge --uncommitted
  67
  68 On Fri, Jan 8, 2010 at 10:24, Eli Zaretskii <eliz@gnu.org> wrote:
  69
  70 > > Btw, can anyone explain what does "merge --uncommitted" do?  Its
  71 > > description in the docs is cryptic:
  72 > >
  73 > >  --uncommitted    Apply uncommitted changes from a working copy, instead
  74 > >                   of branch changes.
  75
  76 After
  77
  78   cd trunk
  79   bzr merge --uncommitted ../my-branch
  80
  81 the trunk's tree will have the changes that were (and still are) in
  82 my-branch's tree. It's a way to copy uncommitted changes between
  83 trees, instead of the normal merge, which copies committed changes
  84 between branches.
  85
  86     Juanma
  87
  88 On Fri, Jan 8, 2010 at 13:31, Eli Zaretskii <eliz@gnu.org> wrote:
  89
  90 > > So it's a way of merging with modified files from the named branch,
  91 > > without naming those files explicitly?
  92
  93 Yes.
  94
  95     Juanma