bughelper improvements
Henrik Nilsen Omma
henrik at ubuntu.com
Thu Dec 14 15:18:26 GMT 2006
Daniel Holbach wrote:
> On Do, 2006-12-14 at 14:26 +0100, Henrik Nilsen Omma wrote:
>
>> Will do. Perhaps you can advice. On
>> bzr merge http://bazaar.launchpad.net/~dholbach/bughelper/bughelper.dev
>>
>> I get
>> bzr: ERROR: Branches have no common ancestor, and no merge base revision
>> was specified.
>>
>
> I guess the problem is that ~henrik/bughelper/dev and
> ~dholbach/bughelper/bughelper.dev were not both based on
> ~bugsquad/bughelper/bughelper.main
>
> If you're entirely happy with the diff, you can try using "--force".
>
Yeah, no joy. -- man, I need to use bzr more frequently :/
bzr merge --force
http://bazaar.launchpad.net/~dholbach/bughelper/bughelper.devbzr: ERROR:
Branches have no common ancestor, and no merge base revision was specified.
Can't we just both push to the bughelper project repo? I guess you need
to join that project or something.
> Good thinking, I'll add a '-l http://...' now. -l, because -u could be
> "unconfirmed" and -U "unassigned" or something. :-)
>
> Maybe we should start a document on how the command line interface could
> work.
>
Good idea, though I was thinking more of a GUI version ;) Perhaps you'll
draw up a few such command line flags and I'll mock-up a GUI?
Henrik
More information about the Ubuntu-bugsquad
mailing list