Hi, I can't help you with configuring your proxy, but I'd suggest create your branch the following way: mkdir inkscape cd inkscape bzr init-repo . bzr checkout lp:inkscape trunk bzr branch lp:inkscape your_branch bzr push lp:~your_login/inkscape/your_branch
This gives you a shared repository where you always have got a copy of the current trunk as well as your own branch. To merge from trunk you'd do a cd trunk bzr update cd ../your_branch bzr merge ../trunk
Using "branch" instead of "checkout" allows you to commit even when you're offline (and reverting commits and the like).
Regards, Markus
-----Ursprüngliche Nachricht----- Von: Isobel Knowles [mailto:ik5@...2950...] Gesendet: Sonntag, 23. März 2014 20:41 An: Johan Engelen Cc: inkscape-devel@lists.sourceforge.net Betreff: Re: [Inkscape-devel] Building with make
On Sat, 22 Mar 2014 23:26:18 +0000 Isobel Knowles <ik5@...2950...> wrote:
On Sat, 22 Mar 2014 19:16:29 +0100 Johan Engelen <jbc.engelen@...2592...> wrote:
Hi Isobel, Could you make a branch instead? It's prohibitively painful to use the diff-files you posted on Windows.
Dear Johan,
I am sorry I have made things difficult for you. That was not my intention. At this stage, I'm afraid I cannot make a bazaar branch because whilst I am now able to collect tar files of named bazaar revisions from the bazaar browser on the web, I am unable to access bazaar itself.
I would much prefer to work without my hands tied behind my back, but my web browser seems to spit feathers on the OpenID stuff that launchpad uses. I think it might be something to do with my web proxies, but frankly it's beyond me. I suspect that if someone (you, perhaps) could set up an account for me on launchpad and emailed me the password (or whatever it is bazaar uses), or even just explain the process in more detail than the notes on the wiki do, I could get it going. I'm champing at the bit, but I don't want to be a burden.
Dear Johan and Bazaar gurus,
You can call off the dogs! I've finally managed to create a launchpad account! Amazingly, I needed to compile dozens of ffox dependencies with -O0 but glib with -O3 before ffox would show the create account page. I've come across some abominable web sites in recent years, but never have I experienced anything that's prodded so many browser bugs in one go. It's bazaar.
I've managed to perform a bzr launchpad-login by setting http[s]_proxy, but I'm stumped at the next step:
# bzr checkout lp:inkscape ssh: connect to host bazaar.launchpad.net port 22: Network is unreachable ConnectionReset reading response for 'BzrDir.open_2.1', retrying ssh: connect to host bazaar.launchpad.net port 22: Network is unreachable bzr: ERROR: Connection closed: Unexpected end of message. Please check connectivity and permissions, and report a bug if problems persist. # _
Yours,
Is.
---------------------------------------------------------------------------- -- Learn Graph Databases - Download FREE O'Reilly Book "Graph Databases" is the definitive new guide to graph databases and their applications. Written by three acclaimed leaders in the field, this first edition is now available. Download your free book today! http://p.sf.net/sfu/13534_NeoTech _______________________________________________ Inkscape-devel mailing list Inkscape-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/inkscape-devel