Hi
I did not merge the https://code.launchpad.net/~zkrynicki/abrek/save-tests-as-uuid/+merge/58356 and I found the uuid is included in https://code.launchpad.net/~zkrynicki/abrek/use-document-io
Now I manually removed the uuid changes in 58356 and push the changes to this mp.
BR
/Chi Thu
On 7 June 2011 18:39, Paul Larson <email address hidden> wrote:
> Review: Needs Fixing > This seems to work, but somehow you seem to have picked up the changes from > https://code.launchpad.net/~zkrynicki/abrek/save-tests-as-uuid/+merge/58356which I asked that we *not* pick up for now. > > It also might have been easier to spot this if you had done a commit for > each merge. You only have 3 commits here, but there were several branches > going into this. > -- > https://code.launchpad.net/~le-chi-thu/abrek/merging_w1121/+merge/63709 > You are the owner of lp:~le-chi-thu/abrek/merging_w1121. >
« Back to merge proposal
Hi
I did not merge the /code.launchpad .net/~zkrynicki /abrek/ save-tests- as-uuid/ +merge/ 58356 /code.launchpad .net/~zkrynicki /abrek/ use-document- io
https:/
and I
found the uuid is included in
https:/
Now I manually removed the uuid changes in 58356 and push the changes to
this mp.
BR
/Chi Thu
On 7 June 2011 18:39, Paul Larson <email address hidden> wrote:
> Review: Needs Fixing /code.launchpad .net/~zkrynicki /abrek/ save-tests- as-uuid/ +merge/ 58356which I asked that we *not* pick up for now. /code.launchpad .net/~le- chi-thu/ abrek/merging_ w1121/+ merge/63709
> This seems to work, but somehow you seem to have picked up the changes from
> https:/
>
> It also might have been easier to spot this if you had done a commit for
> each merge. You only have 3 commits here, but there were several branches
> going into this.
> --
> https:/
> You are the owner of lp:~le-chi-thu/abrek/merging_w1121.
>