[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: Diff between Branches
From: |
Robert Millan |
Subject: |
Re: Diff between Branches |
Date: |
Sat, 31 Oct 2009 14:44:47 +0100 |
User-agent: |
Mutt/1.5.18 (2008-05-17) |
On Sat, Oct 31, 2009 at 12:36:57PM +0000, Carles Pina i Estany wrote:
>
> Hi,
>
> 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/
The gettext branch was based on an old trunk, I've just regenerated it,
try branching again.
> 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:
Is this what you wanted?
bzr diff -r ancestor:bzr+ssh://bzr.savannah.gnu.org/grub/trunk/grub
Btw, if you're just trying to resync, it's better if you use bzr for that,
e.g.:
$ bzr pull bzr+ssh://bzr.savannah.gnu.org/grub/trunk/grub
bzr: ERROR: These branches have diverged. Use the missing command to see how.
Use the merge command to reconcile them.
$ bzr merge bzr+ssh://bzr.savannah.gnu.org/grub/trunk/grub
[...]
Text conflict in conf/common.rmk
Text conflict in kern/misc.c
Text conflict in util/grub-mkconfig_lib.in
Text conflict in util/grub.d/00_header.in
Text conflict in util/grub.d/10_linux.in
5 conflicts encountered.
<some manual work with conf/common.rmk and conf/common.rmk.*>
$ bzr resolve conf/common.rmk
<repeat untill all conflicts are resolved, then commit>
After this is done, you can push to /people/<your-dir>/gettext or so.
--
Robert Millan
The DRM opt-in fallacy: "Your data belongs to us. We will decide when (and
how) you may access your data; but nobody's threatening your freedom: we
still allow you to remove your data and not access it at all."