[IPython-dev] bzr - what am I doing wrong?

[Ville M. Vainio]

On Wed, Jun 4, 2008 at 11:21 AM, Fernando Perez <fperez.net at gmail.com> wrote:

> I am now using the two-branch system we discussed earlier, but still
> when I pull in the changes from trunk and push again, the problem of
> 'history folding' happens:

You are doing something wrong.

What you need to do is (iptrunk is your local trunk, ipfix is your
change branch):

cd /iptrunk
bzr pull
bzr merge ../ipfix
bzr ci
bzr push

-- 
Ville M. Vainio - vivainio.googlepages.com
blog=360.yahoo.com/villevainio - g[mail | talk]='vivainio'