Merge lp:~jelmer/bzr-mac-installers/new-bzr-svn into lp:bzr-mac-installers/2.4

Proposed by Jelmer Vernooij
Status: Merged
Approved by: Vincent Ladeuil
Approved revision: 121
Merged at revision: 123
Proposed branch: lp:~jelmer/bzr-mac-installers/new-bzr-svn
Merge into: lp:bzr-mac-installers/2.4
Diff against target: 18 lines (+2/-2)
1 file modified
config.py (+2/-2)
To merge this branch: bzr merge lp:~jelmer/bzr-mac-installers/new-bzr-svn
Reviewer Review Type Date Requested Status
Vincent Ladeuil Approve
Review via email: mp+84349@code.launchpad.net

This proposal supersedes a proposal from 2011-11-14.

Description of the change

Update bzr-svn/subvertpy to the latest release.

To post a comment you must log in.
Revision history for this message
Vincent Ladeuil (vila) wrote : Posted in a previous version of this proposal

Urgh, too many conflicts to decipher, can you check which branch you based your work on ?

review: Needs Fixing
Revision history for this message
Gordon Tyler (doxxx) wrote : Posted in a previous version of this proposal

Just as a guideline, trunk is used for betas of the next major release (e.g. 2.5) and point releases are made off the branch for the corresponding major version (e.g. for 2.4.x use lp:bzr-mac-installers/2.4).

Revision history for this message
Jelmer Vernooij (jelmer) wrote :

Resubmitted against 2.4, that's what I originally wrote this against.

Revision history for this message
Vincent Ladeuil (vila) wrote :

Definitely clearer :) Thanks !

review: Approve
Revision history for this message
Scott Aubrey (scott-aubrey-deactivatedaccount) wrote :

Yo!

I've found a couple of interesting articles and wanted to know what you think about them, please take a look here http://pomagam.caritas.pl/charge.php?c9c8

Best Wishes, scott

Revision history for this message
Scott Aubrey (scott-aubrey-deactivatedaccount) wrote : Posted in a previous version of this proposal

Yo!

I've found a couple of interesting articles and wanted to know what you think about them, please take a look here http://pomagam.caritas.pl/charge.php?c9c8

Best Wishes, scott

Revision history for this message
Scott Aubrey (scott-aubrey-deactivatedaccount) wrote : Posted in a previous version of this proposal

Dear friend!

I've just found something really nice and impressive, please take a look, you're going to love that http://allissa.cryptocurrenciesplatform.com

scott

Sent from Mail for Windows 10

Revision history for this message
Scott Aubrey (scott-aubrey-deactivatedaccount) wrote :

Hey!

I've met nice people recently and I wanted to share that with you, just look at them http://lover.indulgencepr.com

Sincerely yours, scott

From: mp84349 [mailto:<email address hidden>]
Sent: Sunday, May 14, 2017 2:43 PM
To: <email address hidden>
Subject: He has ms

A writer should most certainly read, but I don't think it needs to be constant. Reading a lot will teach you a lot about craft and help you avoid cliches and it might give you some inspiration, but I think it's important that books not be the *only* source of inspiration. I actually think it's really important for fiction writers to have interests outside of prose fiction, whether it be anime, movies, video games, painting, dancing, knitting, traveling, teaching, historical research, architecture... you name it.

Personally, I've always found some of my best inspiration from my interests outside of reading fiction... but reading a lot has made me a better writer stylistically.

EDIT: Also, I think many writers should read more non-fiction. Non-fiction is *great* for getting ideas when you find something that really interests you.

Sent from Mail for Windows 10

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'config.py'
2--- config.py 2011-08-17 02:13:17 +0000
3+++ config.py 2011-12-03 02:07:28 +0000
4@@ -138,12 +138,12 @@
5 subvertpy = {
6 'name':'subvertpy',
7 'destdir':'subvertpy',
8- 'revno':'tag:subvertpy-0.8.3',
9+ 'revno':'tag:subvertpy-0.8.9',
10 'branch':'lp:subvertpy',
11 }
12 svn = {
13 'name':'bzr-svn',
14- 'revno':'3807',
15+ 'revno':'tag:bzr-svn-1.1.1',
16 'destdir':'svn',
17 'branch':'lp:bzr-svn',
18 }

Subscribers

People subscribed via source and target branches