emacs-devel
[Top][All Lists]
Advanced

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

Re: Switching to bzr: what remains to be done?


From: Karl Fogel
Subject: Re: Switching to bzr: what remains to be done?
Date: Thu, 18 Dec 2008 11:28:48 -0500
User-agent: Gnus/5.13 (Gnus v5.13) Emacs/23.0.60 (gnu/linux)

Tassilo Horn <address@hidden> writes:
> I don't have any bzr repository checked out currently, so I couldn't
> test my assertion.  But reading the docs of bzr-1.10 it seems to me that
> `bzr diff' only accepts files as arguments (no directories), too.
>
> Maybe that could make syncing parts that also have an external
> repository difficult.  One candidate suffering from that could be
> org-mode, which resides at lisp/org/.

Looks like diff can take directories:

  $ bzr --version
  Bazaar (bzr) 1.11dev
    from bzr checkout /home/kfogel/src/bzr/bzr.dev
      revision: 3829
      revid: address@hidden
      branch nick: bzr.dev
    Python interpreter: /usr/bin/X11/python 2.5.2
    Python standard library: /usr/lib/python2.5
    bzrlib: /home/kfogel/src/bzr/bzr.dev/bzrlib
    Bazaar configuration: /home/kfogel/.bazaar
    Bazaar log file: /home/kfogel/.bzr.log
  
  Copyright 2005, 2006, 2007, 2008 Canonical Ltd.
  http://bazaar-vcs.org/
  
  bzr comes with ABSOLUTELY NO WARRANTY.  bzr is free software, and
  you may use, modify and redistribute it under the terms of the GNU
  General Public License version 2 or later.
  
  $ pwd
  /home/kfogel/src/bzr/bzr.dev
  $ ls
  BRANCH.TODO  bzrlib/          generate_docs.pyc  profile_imports.py  tools/
  build/             contrib/           INSTALL            README
  bzr*       COPYING.txt        Makefile           setup.py*
  bzr.1      doc/               man1/              sigh.diff
  bzr.ico      generate_docs.py*        NEWS               TODO
  $ echo "small change to NEWS" >> NEWS
  $ echo "small change to default.css" >> doc/default.css
  $ echo "small change to riodemo.py" >> tools/riodemo.py
  $ bzr status
  modified:
    NEWS
    doc/default.css
    tools/riodemo.py
  $ bzr diff
  === modified file 'NEWS'
  --- NEWS      2008-12-17 10:21:38 +0000
  +++ NEWS      2008-12-18 16:25:26 +0000
  @@ -7624,3 +7624,4 @@
   
   ..
      vim: tw=74 ft=rst ff=unix
  +small change to NEWS
  
  === modified file 'doc/default.css'
  --- doc/default.css   2008-02-07 07:05:13 +0000
  +++ doc/default.css   2008-12-18 16:25:20 +0000
  @@ -162,3 +162,4 @@
   span, th.field-name {
     white-space: nowrap;
   }
  +small change to default.css
  
  === modified file 'tools/riodemo.py'
  --- tools/riodemo.py  2005-11-28 08:03:42 +0000
  +++ tools/riodemo.py  2008-12-18 16:26:03 +0000
  @@ -58,3 +58,4 @@
               raise NotImplementedError()
           inv.add(ie)
       return inv
  +small change to riodemo.py
  
  $ bzr diff doc
  === modified file 'doc/default.css'
  --- doc/default.css   2008-02-07 07:05:13 +0000
  +++ doc/default.css   2008-12-18 16:25:20 +0000
  @@ -162,3 +162,4 @@
   span, th.field-name {
     white-space: nowrap;
   }
  +small change to default.css
  
  $ bzr diff doc tools
  === modified file 'doc/default.css'
  --- doc/default.css   2008-02-07 07:05:13 +0000
  +++ doc/default.css   2008-12-18 16:25:20 +0000
  @@ -162,3 +162,4 @@
   span, th.field-name {
     white-space: nowrap;
   }
  +small change to default.css
  
  === modified file 'tools/riodemo.py'
  --- tools/riodemo.py  2005-11-28 08:03:42 +0000
  +++ tools/riodemo.py  2008-12-18 16:26:03 +0000
  @@ -58,3 +58,4 @@
               raise NotImplementedError()
           inv.add(ie)
       return inv
  +small change to riodemo.py
  
  $ 





reply via email to

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