Web interface update

Lalo Martins lalo at exoweb.net
Mon May 9 07:52:25 BST 2005


GOTCHA...

it's not the timestamps, but the "@@" line.  I find diff outputs (and
patch expects) @@ -0,0 +1,N @@ whereas bzr outputs @@ -1,0 +1,N @@

Patch attached.

Lalo Martins wrote:
> According to `info diff`:
> 
>   If you give `diff' the `-N' or `--new-file' option, or if you supply
>   an old or new file that is named `/dev/null' or is empty and is dated
>   the Epoch (1970-01-01 00:00:00 UTC), `diff' outputs a patch that adds
>   or deletes the contents of this file.  When given such a patch,
>   `patch' normally creates a new file or removes the old file.
> 
> so it seems to be the absence of the timestamps which boggles patch.
> I'll make a few experiments, and if I can get it to work, maybe I can
> submit my first bzr patch :-)


best,
                                               Lalo Martins
--
      So many of our dreams at first seem impossible,
       then they seem improbable, and then, when we
       summon the will, they soon become inevitable.
--
http://www.exoweb.net/                  mailto:lalo at exoweb.net
GNU: never give up freedom                 http://www.gnu.org/
-------------- next part --------------
An embedded and charset-unspecified text was scrubbed...
Name: sane-add-remove-diffs.diff
Url: https://lists.ubuntu.com/archives/bazaar/attachments/20050509/9b1fc58c/attachment.diff 


More information about the bazaar mailing list