photostory team mailing list archive

[Josh Brown <joshbrown15@xxxxxxxxx>]

I've merged in your changes. To do this you need a copy of the base
branch (<lp:~photostory/photostory/code>), you then open that, merge the
other branch in, and push it back up to Launchpad.

You seem to be using regular tabs in your code, Photostory uses spaces
so to avoid confusion it is necessary use spaces exclusively. There are
plugins for most text editors to help with this, I personally use Gedit
with Auto Tab, Draw Spaces and Smart Spaces.

I've replaced the spaces with tabs and changed `python2` back to
`python`. Please correct me if I made a mistake doing so.

Thanks.
 

On Sat, 2011-02-26 at 23:28 +0000, Joel Dimbernat wrote:
> Hi,
> 
> the modifications in my branch have been approved by Joel Auterson, and
> he asked me to merge them into trunk.
> 
> Sadly, I'm really new in Launchpad and Bazaar, and I don't know how to
> do it. I tried the bzr merge lp:photostory from my branch but it
> produces a revision 44 while the trunk is at 45... so... seems like it
> doesn't work.
> 
> If you could do it, or explain me how to do it, I'd be very thankful.
> 
> Joel Dimbernat