dhcp243253:galaxy-central kanwei$ hg transplant -s
~/peter/galaxy-central/ -b blast25
searching for changes
changeset:   5585:ab40f95393ec
branch:      blast25
parent:      5583:086c9c2c52b9
user:        peterjc <p.j.a.c...@googlemail.com>
date:        Mon Apr 04 12:12:11 2011 +0100
summary:     Update tests for NCBI BLAST 2.2.25+ which fixed subject
ID in tabular output

apply changeset? [ynmpcq?]: y
changeset:   5586:124e4556f3c5
branch:      blast25
user:        peterjc <p.j.a.c...@googlemail.com>
date:        Mon Apr 04 14:44:52 2011 +0100
summary:     Include optional parameters in BLASTP test to avoid KeyError

apply changeset? [ynmpcq?]: y
searching for changes
adding changesets
adding manifests
adding file changes
added 2 changesets with 4 changes to 4 files
dhcp243253:galaxy-central kanwei$ hg tip
changeset:   5338:124e4556f3c5
branch:      blast25
tag:         tip
user:        peterjc <p.j.a.c...@googlemail.com>
date:        Mon Apr 04 14:44:52 2011 +0100
summary:     Include optional parameters in BLASTP test to avoid KeyError

dhcp243253:galaxy-central kanwei$ hg push
pushing to https://kan...@bitbucket.org/galaxy/galaxy-central/
searching for changes
abort: push creates new remote branches: blast25!
(use 'hg push --new-branch' to create new remote branches)
dhcp243253:galaxy-central kanwei$ hg merge blast25
abort: merging with a working directory ancestor has no effect

Importing the diffs gives merge error

On Mon, Apr 4, 2011 at 11:23 AM, Peter Cock <p.j.a.c...@googlemail.com> wrote:
> On Mon, Apr 4, 2011 at 4:10 PM, Kanwei Li <kan...@gmail.com> wrote:
>> I think it's because the parent of those changesets were before your
>> merge, so the branches got messed up
>
> But I haven't done any merge in this branch's history... It starts here,
> with James' latest commit to the trunk:
>
> https://bitbucket.org/galaxy/galaxy-central/changeset/086c9c2c52b9
> https://bitbucket.org/peterjc/galaxy-central/changeset/086c9c2c52b9
>
> Then I update the test files,
>
> https://bitbucket.org/peterjc/galaxy-central/changeset/ab40f95393ec
>
> Then I update missing arguments in one test:
>
> https://bitbucket.org/peterjc/galaxy-central/changeset/124e4556f3c5
>
> This seems to be confirmed by hg log,
>
> $ hg log --branch blast25
> changeset:   5586:124e4556f3c5
> branch:      blast25
> tag:         tip
> user:        peterjc <p.j.a.c...@googlemail.com>
> date:        Mon Apr 04 14:44:52 2011 +0100
> summary:     Include optional parameters in BLASTP test to avoid KeyError
>
> changeset:   5585:ab40f95393ec
> branch:      blast25
> parent:      5336:086c9c2c52b9
> user:        peterjc <p.j.a.c...@googlemail.com>
> date:        Mon Apr 04 12:12:11 2011 +0100
> summary:     Update tests for NCBI BLAST 2.2.25+ which fixed subject
> ID in tabular output
>
>
> Do you definitely have the latest code from galaxy-central in your
> repository? If you local copy is out of date that might explain things.
>
> Peter
>

___________________________________________________________
Please keep all replies on the list by using "reply all"
in your mail client.  To manage your subscriptions to this
and other Galaxy lists, please use the interface at:

  http://lists.bx.psu.edu/

Reply via email to