[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: Diff between Branches
From: |
Colin Watson |
Subject: |
Re: Diff between Branches |
Date: |
Sat, 31 Oct 2009 13:26:22 +0000 |
User-agent: |
Mutt/1.5.18 (2008-05-17) |
On Sat, Oct 31, 2009 at 12:36:57PM +0000, Carles Pina i Estany wrote:
> I'm novice with Bazaar.
> I would like to diff between gettext branch and trunk. I did:
>
> bzr branch http://bzr.savannah.gnu.org/r/grub/people/robertmh/gettext/
> cd gettext
> bzr diff -r branch:http://bzr.savannah.gnu.org/r/ub/trunk/grub
>
> But I have some unexpected results like adding files and removing files
> that I would not expect:
>
> === added file 'AUTHORS'
> --- AUTHORS 1970-01-01 00:00:00 +0000
> +++ AUTHORS 2009-10-31 12:19:08 +0000
>
> and then:
> === removed file 'AUTHORS'
> --- AUTHORS 2005-09-03 16:54:27 +0000
> +++ AUTHORS 1970-01-01 00:00:00 +0000
This usually means that there is a problem with the way the branches
were created or with the way they've been managed, such that the files
in each branch do not have common ancestry. (Bazaar assigns each file a
unique file-id in order to support good rename tracking, and will only
consider two files to be different versions of the same file if they
have the same file-id; you can see the file-id with e.g. 'bzr ls
--show-ids'.)
I haven't looked at these two branches to find out exactly what's
happened.
--
Colin Watson address@hidden