Re: [Monotone-devel] Packages for Debian testing
In message <[EMAIL PROTECTED]> on Wed, 4 Jul 2007 14:30:32 -0700, "Zack Weinberg" <[EMAIL PROTECTED]> said: zackw> On 7/4/07, Richard Levitte <[EMAIL PROTECTED]> wrote: zackw> > In message <[EMAIL PROTECTED]> on Wed, 4 Jul 2007 21:24:16 +0200, Ludovic Brenta <[EMAIL PROTECTED]> said: zackw> > zackw> > ludovic> I suggest you and Richard merge your packaging scripts. They zackw> > ludovic> are in Monotone itself, so that should be easy :) zackw> > zackw> > There's nothing much to merge, really. The stuff in monotone is zackw> > usable as is, as far as I know. zackw> zackw> Between your 0.35-0.1 and the -0.2 I'm suggesting for Debian there are zackw> three changes: zackw> zackw> * No -DBOOST_SP_DISABLE_THREAD; this is a workaround for problems zackw> reported on powerpc, IIRC. (From 0.31-8.) zackw> * Backport Tim's post-0.35 fixes for boost 1.34. zackw> * List all the fixed Debian bugs in debian/changelog ;-) Yes? That's what's included in the changes you committed/pushed, right? Cheers, Richard - Please consider sponsoring my work on free software. See http://www.free.lp.se/sponsoring.html for details. -- Richard Levitte [EMAIL PROTECTED] http://richard.levitte.org/ "When I became a man I put away childish things, including the fear of childishness and the desire to be very grown up." -- C.S. Lewis ___ Monotone-devel mailing list Monotone-devel@nongnu.org http://lists.nongnu.org/mailman/listinfo/monotone-devel
Re: [Monotone-devel] Packages for Debian testing
On 7/4/07, Richard Levitte <[EMAIL PROTECTED]> wrote: In message <[EMAIL PROTECTED]> on Wed, 4 Jul 2007 21:24:16 +0200, Ludovic Brenta <[EMAIL PROTECTED]> said: ludovic> I suggest you and Richard merge your packaging scripts. They ludovic> are in Monotone itself, so that should be easy :) There's nothing much to merge, really. The stuff in monotone is usable as is, as far as I know. Between your 0.35-0.1 and the -0.2 I'm suggesting for Debian there are three changes: * No -DBOOST_SP_DISABLE_THREAD; this is a workaround for problems reported on powerpc, IIRC. (From 0.31-8.) * Backport Tim's post-0.35 fixes for boost 1.34. * List all the fixed Debian bugs in debian/changelog ;-) zw ___ Monotone-devel mailing list Monotone-devel@nongnu.org http://lists.nongnu.org/mailman/listinfo/monotone-devel
Re: [Monotone-devel] Packages for Debian testing
In message <[EMAIL PROTECTED]> on Wed, 4 Jul 2007 21:24:16 +0200, Ludovic Brenta <[EMAIL PROTECTED]> said: ludovic> I suggest you and Richard merge your packaging scripts. They ludovic> are in Monotone itself, so that should be easy :) There's nothing much to merge, really. The stuff in monotone is usable as is, as far as I know. If we really want to play around with packaging scripts, maybe we should consider making a mtn-buildpackage ;-). (I've been thinking of it... yet another thing on my lower half of my TODO list...) Cheers, Richard - Please consider sponsoring my work on free software. See http://www.free.lp.se/sponsoring.html for details. -- Richard Levitte [EMAIL PROTECTED] http://richard.levitte.org/ "When I became a man I put away childish things, including the fear of childishness and the desire to be very grown up." -- C.S. Lewis ___ Monotone-devel mailing list Monotone-devel@nongnu.org http://lists.nongnu.org/mailman/listinfo/monotone-devel
Re: [Monotone-devel] Packages for Debian testing
Zack Weinberg writes: > On 7/4/07, Ludovic Brenta <[EMAIL PROTECTED]> wrote: >> >> Shaun, your last upload of monotone to Debian is from March 2007, and >> testing and unstable still carry 0.31 (0.33 is in experimental). Are >> you planning to continue maintaining the packages in Debian? If not, >> I can sponsor Richard, as I am a Debian Developer and an everyday user >> of Monotone. > > Shaun's ability to work on Debian is very limited at the moment. > > Richard's snapshots are not currently suitable for direct inclusion in > Debian (there's been no effort to mark Debian bugs closed, and there > are a small number of places where an official package needs to > diverge from the snapshots. > > I've actually prepared an 0.35 package suitable for Debian just > yesterday - you can get it from http://mrtock.ucsd.edu/~zack/debian/. > It'd be great if you could check that and upload it. I suggest you and Richard merge your packaging scripts. They are in Monotone itself, so that should be easy :) > Longer term, I understand that Shaun is interested in having someone > take over the package - He should file a bug against wnpp stating he's looking for a co-maintainer, or orphaning the package. I did look for such a bug and didn't find one. So, I'll await his reply. > perhaps that could be you, in collaboration > with me and Richard. I'm not interested in running the NM gauntlet > myself, but I'd be happy to take on some of the work in maintaining > this one package. OK. I'm willing to sponsor the package but not to do the actual packaging work, so, if Shaun is willing to hand the package over, it soulds like we've got a deal :) -- Ludovic Brenta. ___ Monotone-devel mailing list Monotone-devel@nongnu.org http://lists.nongnu.org/mailman/listinfo/monotone-devel
Re: [Monotone-devel] Packages for Debian testing
On 7/4/07, Ludovic Brenta <[EMAIL PROTECTED]> wrote: Shaun, your last upload of monotone to Debian is from March 2007, and testing and unstable still carry 0.31 (0.33 is in experimental). Are you planning to continue maintaining the packages in Debian? If not, I can sponsor Richard, as I am a Debian Developer and an everyday user of Monotone. Shaun's ability to work on Debian is very limited at the moment. Richard's snapshots are not currently suitable for direct inclusion in Debian (there's been no effort to mark Debian bugs closed, and there are a small number of places where an official package needs to diverge from the snapshots. I've actually prepared an 0.35 package suitable for Debian just yesterday - you can get it from http://mrtock.ucsd.edu/~zack/debian/. It'd be great if you could check that and upload it. Longer term, I understand that Shaun is interested in having someone take over the package - perhaps that could be you, in collaboration with me and Richard. I'm not interested in running the NM gauntlet myself, but I'd be happy to take on some of the work in maintaining this one package. zw ___ Monotone-devel mailing list Monotone-devel@nongnu.org http://lists.nongnu.org/mailman/listinfo/monotone-devel
Re: [Monotone-devel] Packages for Debian testing
Richard Levitte writes: > So, from now on, you should be able to install on Debian testing with > the following lines in /etc/apt/sources.list: > > deb http://guardian.lp.se/debian testing/ > deb-src http://guardian.lp.se/debian testing/ > > Those using Debian unstable should of course stay with the following: > > deb http://guardian.lp.se/debian unstable/ > deb-src http://guardian.lp.se/debian unstable/ Shaun, your last upload of monotone to Debian is from March 2007, and testing and unstable still carry 0.31 (0.33 is in experimental). Are you planning to continue maintaining the packages in Debian? If not, I can sponsor Richard, as I am a Debian Developer and an everyday user of Monotone. -- Ludovic Brenta. ___ Monotone-devel mailing list Monotone-devel@nongnu.org http://lists.nongnu.org/mailman/listinfo/monotone-devel
[Monotone-devel] Packages for Debian testing
Hello, previously, my builds of the following snapshot packages for Debian unstable worked well with Debian testing as well. Not so any more since the release of Debian 4.0, so I've finally written the little script to backport my snapshots to testing. The relevant packages are: monotone-server monotone-doc monotone monotone-viz So, from now on, you should be able to install on Debian testing with the following lines in /etc/apt/sources.list: deb http://guardian.lp.se/debian testing/ deb-src http://guardian.lp.se/debian testing/ Those using Debian unstable should of course stay with the following: deb http://guardian.lp.se/debian unstable/ deb-src http://guardian.lp.se/debian unstable/ Cheers, Richard - Please consider sponsoring my work on free software. See http://www.free.lp.se/sponsoring.html for details. -- Richard Levitte [EMAIL PROTECTED] http://richard.levitte.org/ "When I became a man I put away childish things, including the fear of childishness and the desire to be very grown up." -- C.S. Lewis ___ Monotone-devel mailing list Monotone-devel@nongnu.org http://lists.nongnu.org/mailman/listinfo/monotone-devel
[Monotone-devel] Re: Sharing subprojects between projects
Bruce Stephens <[EMAIL PROTECTED]> writes: > Anthony Williams <[EMAIL PROTECTED]> writes: > > [...] > >> Also, in my case it doesn't work so well --- I would like to make >> changes to the subproject as appropriate to the master project it's >> being used in, optionally propagate these changes back to the >> subproject branch, and still be able to pull in changes made to the >> subproject elsewhere. > > So (in current terms), you'd want to branch the subproject, > merge_into_dir that branch into the main branch (and propagate from > then on). Generally you'd then want changes just to propagate into > the branch of the subproject, but occasionally you'd want them to go > into the original. > > So if changes to a merge_into_dir could be somehow committed to the > branch, you could do something close to what you want now just by > adding an extra branch (to represent the variant of the subproject > that's for this master project). As you say, pluck comes reasonably > close, though there are likely problems because pluck is basically > "patch". > > I'd just use nested checkouts in this case. With this extra branch > that ought to work OK. It would be nice to have a little more > support, but as I mentioned, what that ought to include isn't obvious. Thanks for everyone's suggestions on this. I've been mulling it over and trying out a few things. Here's what I think is my ideal solution: Shared library is on branch shared.lib Application 1 is on branch app1 Application 2 is on branch app2 New command branch_into_dir This command needs to be run in a workspace. must not exist as a branch name. A new branch is created called as a copy of . This branch is checked out into within the current workspace, and this fact is registered in the database. A commit anywhere in the workspace will commit both the branch in the nested directory and the main branch at the workspace root. cd /projects mtn co app1 cd /projects/app1 mtn branch_into_dir shared.lib shared.lib.app1 lib # app1/lib now contains the code for shared.lib mtn ci # commit changes echo foo >> file1 # append something to a file in the workspace cd /projects/app1/lib echo bar >> file2 #edit file2 echo baz > new_file mtn add new_file #add new_file mtn ci #file1 checked into app1 branch #file2 checked into shared.lib.app1 branch #new_file added to shared.lib.app1 branch Changes from the new shared.lib.app1 branch can be propagated to and from the shared.lib branch using propagate as normal mtn propagate shared.lib.app1 shared.lib Anthony -- Anthony Williams Just Software Solutions Ltd - http://www.justsoftwaresolutions.co.uk Registered in England, Company Number 5478976. Registered Office: 15 Carrallack Mews, St Just, Cornwall, TR19 7UL ___ Monotone-devel mailing list Monotone-devel@nongnu.org http://lists.nongnu.org/mailman/listinfo/monotone-devel
[Monotone-devel] Re: ViewMTN patch: accept timestamps with microseconds
Ludovic Brenta <[EMAIL PROTECTED]> writes: > I experimented with importing a project into Monotone using tailor. > This worked well, but the timestamps for most revisions contain > microseconds, like this: "2007-06-27T08:58:38.950999". Indeed. In case anyone's worried, that's been fixed in Tailor now. ___ Monotone-devel mailing list Monotone-devel@nongnu.org http://lists.nongnu.org/mailman/listinfo/monotone-devel
[Monotone-devel] ViewMTN patch: accept timestamps with microseconds
-BEGIN PGP SIGNED MESSAGE-
Hash: SHA1
I experimented with importing a project into Monotone using tailor.
This worked well, but the timestamps for most revisions contain
microseconds, like this: "2007-06-27T08:58:38.950999". As a result,
ViewMTN gets a ValueError from time.strptime() when trying to parse
the string, and sends a page with "internal server error". The patch
below solves this problem. You can see the result on
http://www.ada-france.org:8081/branch/changes/org.debian.gcc-4.2 . It
Just Works and is very uninteresting :)
Thanks for ViewMTN!
PS. I committed with key "[EMAIL PROTECTED]" but my usual key is
"[EMAIL PROTECTED]", also attached, just in case you think I
deserve commit rights on one of your databases. This email is
GPG-signed.
- --
Ludovic Brenta.
[keypair [EMAIL PROTECTED]
MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC6GLKlGOz43GGZxxgHPTunD/7Hj/65RFMW
ygr8wBBu68tYFf8Zgp5h/Szw/sVQi6VUDTZEoojPDhvQET5Ayon2SrmUGMd0vP3yoFIvj1gw
Ap1dAPh1u77uECejVflfIr0uS3q+mrwKn2kUCGxLs3fwq2UQY1gODQnSH2ak0nLv9wIDAQAB#
MIICyTBDBgkqhkiG9w0BBQ0wNjAeBgkqhkiG9w0BBQwwEQQI5E+msA8aSN4CAggAAgEYMBQG
CCqGSIb3DQMHBAgAp0szupRmzgSCAoCMhlSVsTut+bxt2AFtgNEtQjO7D6Je0K0LBiB9W4Ww
TNLJm5XGaBEt0hllEVd1v4x/CU2+6STT8ysmioEFk1WhCeVfYHD5nPyWX74tbx9A6+fVKtOE
MXYCnYU+vFaKb7AHi4VrlvUjy64VpVvAx8YhL6HHLAbHTuhN2TpxqkrQ5Cq/j13uInSO/PBA
VKr7xGPz7kznsoGzgdbjTb1AaHaWk8LvJjsa952WXrsOb+IzlgTXkvnSsgoTu1ROungoGmqI
ZdLA0+vtJLUVKrDvJSzIjuAfoWfYzgtuAHeXpoSEfGFHVGfy6B58inCANDPSVPY0faaZ7z1R
K6305rApGR5gbgcxu4xH5kZvT2Ey8a4dSUECmvjMx94dYJ7qC0/tbS+vYHQd12lgChiLL0Tv
HDw817K/STSN573c4oIf7mGWQEJt1rG8vobeD9h/gf3DlAVeAJWsrrDlepW85kC69AeGxVQX
EraVzj4DLOp6LO39/gb9N1E+xqUSTdCLVHUqv57yd0ZnKERPCvXD4Mp+ZsmYr7QFsv2uBIOf
/t8wLgTxGdCWOmOz5cNKpf6xrKFN5erNgwH6XrrIU/oF6HWuMj/beMNTrh4YdZVKro0Xx0wp
BBEqT++gOu8nlBzbIZ6A8vauaAYlvYmrhd4i2n0Gsvo2mK8YVByaNANcGZdzutnMWSno0KGw
C6mtzrgULSiy5+KfDu9V8hakd9lk7Hd1U7jRwRp/zuS+U17MAj3GYDQR0FZ9/sRMJO641qgp
uah4xd5PNFz+YZI4RWB+AImmIg7OV6NYwJlmHqFsTmQ+5+7FHFasI/mDS28k9jiT7BeFNw4i
eYr4Wrq19IwEvhhNPLBY
[end]
- -
Revision: ef26ac329bb15b7607b0bb473c71c84564a2ac02
Ancestor: 7b40124b48efc337e16111a658ac636ae50ac52e
Author: [EMAIL PROTECTED]
Date: 2007-07-04T14:29:08
Branch: net.angrygoats.viewmtn
Modified files:
common.py
ChangeLog:
common.py: handle the special case when the timestamp in the Monotone
database contains microseconds, which time.strptime cannot parse.
- --- common.py 2504e01f69f99347d0e8706fb7c344c6a6471e43
+++ common.py f8f7c657f7c531ed9c11ec3011b78913d971aa0c
@@ -17,6 +17,12 @@ def parse_timecert(value):
import traceback
def parse_timecert(value):
+# The datetime may contain microseconds which time.strptime cannot parse.
+# Drop them. This is easy because Monotone keeps timestamps in ISO 8601
+# format, so microseconds necessarily start with a period.
+index_of_period = value.find ('.')
+if index_of_period > -1:
+value = value[0:index_of_period]
return apply(datetime.datetime, time.strptime(value,
"%Y-%m-%dT%H:%M:%S")[:6])
def set_nonblocking(fd):
-BEGIN PGP SIGNATURE-
Version: GnuPG v1.4.6 (GNU/Linux)
iD8DBQFGi7G2x9kwJZ3/qtQRAnfJAJ9+ab+eF8s0TqlViyuqFvObzJ9mPgCgtJe0
WbIrPiXvynX6YL+KOb79GAQ=
=b6Oj
-END PGP SIGNATURE-
___
Monotone-devel mailing list
Monotone-devel@nongnu.org
http://lists.nongnu.org/mailman/listinfo/monotone-devel
