oqgraph-dev team mailing list archive

[Andrew McDonnell <bugs@xxxxxxxxxxxxxxxxxxx>]

Hi Arjen

looking further, at

http://bazaar.launchpad.net/~oqgraph-dev/maria/10.0-oqgraph3/changes/3648?start_revid=3648

and

http://bazaar.launchpad.net/~oqgraph-dev/maria/10.0-oqgraph3/changes/3642.1.3

I can see that somehow my push ended up in 3642.1.1-3642.1.3, and not
3643-3645, and then it got merged when you committed to 3644

I think this was caused because I managed to make andrew-dev/ a branch instead
of a checkout, that is the only difference I can see between the trees using
bzr info.

(I really need a tool like gitg for bzr so I can check it visually. Or
something like git-svn for bzr.)

With any luck I'll have my launchpad+bzr L-plates off soon :-)

--Andrew


On 01/03/13 20:39, Arjen Lentz wrote:
> Hi Andrew
> 
>> Actually, I am wondering if I did my second push wrong somehow?
> 
> I don't know where you pushed...
> 
> 
>> >From looking at
>> http://bazaar.launchpad.net/~oqgraph-dev/maria/10.0-oqgraph3/changes
>>
>> I can see my commits from Wednesday, but the ones from Thursday you
>> merged
>> somehow - I have an andrew-dev on my local computer, somehow that
>> propagated onto launchpad...
> 
> Nothing magically propagates anywhere.
> You need to push/pull and it either defaults to the location you specified when you did branch, or uses an explicit url you specify in the command. And you can have the system remember that with --remember.
> So you can branch from say lp:maria and then do bzr push --remember lp:newpath
> 
> But push, pull and parent are each somewhat independent (and there are practical uses for that) so you need to make sure you're pulling and pushing correctly by setting it appropriately.
> You can check with bzr info what you have set in each tree.
> 
> 
> Cheers,
> Arjen.