|
From: | Kenneth Loafman |
Subject: | Re: [Duplicity-talk] webdav in trunk broken - File /tmp/... not found locally after get from backend |
Date: | Wed, 7 May 2014 08:19:12 -0500 |
Yeah, but 0.7.0 will have 0.6.24 as an "equivalent" anchor. You'd only notice they were forked earlier if you were going through bzr.On 7 May 2014 09:09, Kenneth Loafman <address@hidden> wrote:It's not me, it's the users. They would not understand revision numbers. Best to give them versions.On Wed, May 7, 2014 at 8:03 AM, Michael Terry <address@hidden> wrote:
The anchor version is r970. If you're not thrilled with having a mere revision number be the anchor, maybe the pain of merging won't be as bad as I say. Just reverse-diff the py24 commit and that's most of it. But still, there will be conflicts.-mt
On 7 May 2014 08:59, Kenneth Loafman <address@hidden> wrote:
The only question I have then is "What is the anchor version?". Are we identical at 0.6.23?On Wed, May 7, 2014 at 7:52 AM, Michael Terry <address@hidden> wrote:
On 7 May 2014 08:36, Kenneth Loafman <address@hidden> wrote:
Here's what I plan to do after 0.6.24 is released.- pull/push 0.6 to 0.7- merge the mt branches we took out of 0.6- make 0.7 the focus of development (lp:duplicity)0.6.24 will be the last point where the two series are equal.That plan will involve a fair bit of pain trying to merge 0.7 on top of 0.6. Because of the py24 changes that you'll have to undo and the various tweaks I had to make to handle the missing trunk merges, you'll have plenty of conflicts just to get to the same point that 0.7-series is already at right now.
I suspect you'll find it easier to treat 0.6-series as its own entity already forked off of trunk.-mt
[Prev in Thread] | Current Thread | [Next in Thread] |