[Monotone-devel] Understanding propagate
Hello, I need help clarifying a workflow. I have three branches. elm.lynx elm.lynx.beta elm.lynx.production The first is mainline development and the subsequent ones beta and production. Now whilst we are in beta we don't stop mainline development, however a beta tester might report a bug which we want a fix for. A developer does that fix in the mainline elm.lynx I then have to review that and decide if its small enough and self contained enough to pull into the beta branch for another beta revision. If I decided it is, then I pluck the revision in question. Sometimes this has happened in the opposite direction where a beta fix is plucked into mainline. However I am now finding that after one or two of these I get a merge conflict when I do: mtn prop elm.lynx elm.lynx.beta The files that were touched report a merge conflict. I we have never propagated from the beta to mainline, its always a one way flow with plucking being the main means to move minor changes. Does the pluck create this problem and should I be propagating back from the beta into the mainline? Regards Phil Hannent signature.asc Description: OpenPGP digital signature ___ Monotone-devel mailing list Monotone-devel@nongnu.org http://lists.nongnu.org/mailman/listinfo/monotone-devel
[Monotone-devel] mtn pluck on winxp failure
Hello, I just tried to pluck a revision based on the information provided here: http://www.monotone.ca/wiki/DaggyFixes/#index3h2 The pluck went perfectly and a diff proved that, however when I tried to commit the work I got an error: C:\mtn\elm.lynx.betamtn commit mtn: beginning commit on branch 'elm.lynx.beta' sh: C:cygwinbindiff3: command not found Error running editor 'C:\cygwin\bin\diff3' to enter log message mtn: misuse: edit of log message failed This was with version 0.45 in a native windows command prompt. Any advice would be helpful. Regards Phil Hannent signature.asc Description: OpenPGP digital signature ___ Monotone-devel mailing list Monotone-devel@nongnu.org http://lists.nongnu.org/mailman/listinfo/monotone-devel
Re: [Monotone-devel] mtn pluck on winxp failure
On 25/03/2010 12:13, Thomas Keller wrote: Am 25.03.2010 10:52, schrieb Phil Hannent: Hello, I just tried to pluck a revision based on the information provided here: http://www.monotone.ca/wiki/DaggyFixes/#index3h2 The pluck went perfectly and a diff proved that, however when I tried to commit the work I got an error: C:\mtn\elm.lynx.betamtn commit mtn: beginning commit on branch 'elm.lynx.beta' sh: C:cygwinbindiff3: command not found Error running editor 'C:\cygwin\bin\diff3' to enter log message mtn: misuse: edit of log message failed This was with version 0.45 in a native windows command prompt. This sounds like a path escaping issue - could you check if happen to have a MTN_MERGE or EDITOR environment variable set which points to C:\cygwin\bin\diff3 instead of C:\\cygwin\\bin\\diff3? That nearly worked: C:\mtn\elm.lynx.betamtn commit mtn: beginning commit on branch 'elm.lynx.beta' sh: C:\Program: command not found Error running editor 'C:\\Program Files\\KDiff3\\kdiff3.exe' to enter log message mtn: misuse: edit of log message failed C:\mtn\elm.lynx.betamtn commit mtn: beginning commit on branch 'elm.lynx.beta' sh: c:\cygwin\bin\diff3.exe: command not found Error running editor 'c:\\cygwin\\bin\\diff3.exe' to enter log message mtn: misuse: edit of log message failed What did work in the end was adding the KDiff3 location to the windows PATH variable and just having kdiff3.exe in the editor and MTN_MERGE variable. Thanks for your help Phil Hannent signature.asc Description: OpenPGP digital signature ___ Monotone-devel mailing list Monotone-devel@nongnu.org http://lists.nongnu.org/mailman/listinfo/monotone-devel
[Monotone-devel] Crash on git_export
Hello, I am running a git_export command with monotone 0.45 on Windows XP in a cygwin shell, however it fails with: mtn: loading mtn: 2558/2558 fatal: Unsupported command: blob fast-import: dumping crash report to .git/fast_import_crash_3744 I notice that there was a fix to a regression for the export in the development source, am I seeing what has been fixed or something completely different? http://viewmtn.angrygoats.net/all/revision/file/a4499efd0bc957705460b3a1a17ca87172e64683/NEWS Whilst I note that the crash is with git I figure that monotone is sending something it does not like. Regards Phil Hannent signature.asc Description: OpenPGP digital signature ___ Monotone-devel mailing list Monotone-devel@nongnu.org http://lists.nongnu.org/mailman/listinfo/monotone-devel
Re: [Monotone-devel] [ANN] monotone 0.43 released
Zack Weinberg wrote: Your compiler is probably pickier about the headers; try adding #include iterator and/or #include algorithm to the top of the file. First off, thanks for your help. It is appreciated. I have just been trying to progress this a little more, I am getting the following error: Error 749 error C2057: expected constant expression c:\buildbot\monotone-0.43.tar\monotone-0.43\mkstemp.cc 141 tester Where it defines: char buf[len+1]; If I convert this to: char* buf = new char[len+1]; It works, however the next message I get is: Error 147 error C3416: 'dump' : an explicit specialization may not be explicitly instantiated c:\buildbot\monotone-0.43.tar\monotone-0.43\vocab.cc 190 tester on this line: template void dump(rsa_pub_key const, string ); Any help would be appreciated. Phil signature.asc Description: OpenPGP digital signature ___ Monotone-devel mailing list Monotone-devel@nongnu.org http://lists.nongnu.org/mailman/listinfo/monotone-devel
Re: [Monotone-devel] [ANN] monotone 0.43 released
Zbigniew Zagórski wrote: 2009/3/26 Phil Hannent p...@hannent.co.uk: Zack Weinberg wrote: Your compiler is probably pickier about the headers; try adding #include iterator and/or #include algorithm to the top of the file. First off, thanks for your help. It is appreciated. I have just been trying to progress this a little more, I am getting the following error: Error 749 error C2057: expected constant expression c:\buildbot\monotone-0.43.tar\monotone-0.43\mkstemp.cc 141 tester ... Error 147 error C3416: 'dump' : an explicit specialization may not be explicitly instantiated c:\buildbot\monotone-0.43.tar\monotone-0.43\vocab.cc 190 tester ... Any help would be appreciated. Hello, What version of g++ are you using. Looks like 4.3 ... monotone is uncompilable with newer 4.3 gcc. Unfortunately. Please try with 3.4.5 - the official version provided by mingw. I am trying to get the visual studio version built so that I can setup a build slave for monotone. Regards Phil Hannent signature.asc Description: OpenPGP digital signature ___ Monotone-devel mailing list Monotone-devel@nongnu.org http://lists.nongnu.org/mailman/listinfo/monotone-devel
Re: [Monotone-devel] [ANN] monotone 0.43 released
Thomas Keller wrote: Phil Hannent schrieb: Zbigniew Zagórski wrote: One note from me: last few versions i've builduploaded win32 installers. Now i'm out of time and resources so I don't know when i will find spare time to build win32 version. Please anyone take note of this and buildupload win32 installer. I was just seeing how much effort it would be to setup a build bot at my office and I noticed the netxx is no longer available: A google shows this link: http://www.icewalkers.com/download/Netxx/1742/dld/ Yes, netxx is dead, but this is not a problem, because we still have the original (and patched) version in tree. IIRC Zack works on a netxx replacement using asio, but this will still take some time, I guess. Ok, I see that now. I am getting an error in txt2c.cc: Error 2 error C2039: 'back_inserter' : is not a member of 'std' c:\buildbot\monotone-0.43.tar\monotone-0.43\txt2c.cc19 txt2c Any hint to a solution to this? Regards Phil Hannent signature.asc Description: OpenPGP digital signature ___ Monotone-devel mailing list Monotone-devel@nongnu.org http://lists.nongnu.org/mailman/listinfo/monotone-devel
Re: [Monotone-devel] [ANN] monotone 0.43 released
Hello, Well done on the release. Thomas Keller wrote: * monotone can now be configured to use forward deltas which speeds netsync servers quite a lot. Quick question, I assume that both the server and client need to be upgraded for this to take effect? Regards Phil Hannent signature.asc Description: OpenPGP digital signature ___ Monotone-devel mailing list Monotone-devel@nongnu.org http://lists.nongnu.org/mailman/listinfo/monotone-devel
Re: [Monotone-devel] mtn status speed
Tony Tung wrote: I'm using monotone with vc-mtn.el in emacs, which calls mtn status file rather frequently. Generally this is fine, but I have a few workspaces with thousands of files, and it seems to be quite slow in those situations. I suspect it is calculating the status for all the files in the workspace, and *then* filtering out just the files in the command line. snip Is there a way to only get the status of a single file quickly? I found a speed up on the Pidgin website: http://developer.pidgin.im/wiki/MonotoneBestPractices Have you tried that? Regards Phil Hannent signature.asc Description: OpenPGP digital signature ___ Monotone-devel mailing list Monotone-devel@nongnu.org http://lists.nongnu.org/mailman/listinfo/monotone-devel
Re: [Monotone-devel] Monotone server
Daniel Carrera wrote: I like the idea of having monotone repository on the server. Even for a one-developer project I think it's useful. Now, my web host is not going to open a TCP port or allow a new server application on a shared host. Am I right to think that the SSH tunnel gets around these restrictions? If I can SSH, I can use monotone on the server, right? I am not sure if it fits your usage however I am using Dropbox [1] for transporting my monotone database around. It is smart in that it will only sync the parts of a file that has changed. However this clearly has some issues in that it cannot scale massively and sharing with other users is not really possible. However you do get roaming access to the monotone database. It was my solution to not being able to run a public monotone server. Regards Phil Hannent [1] http://www.getdropbox.com signature.asc Description: OpenPGP digital signature ___ Monotone-devel mailing list Monotone-devel@nongnu.org http://lists.nongnu.org/mailman/listinfo/monotone-devel
Re: [Monotone-devel] BUG: Windows version doing an anonymous pull
Stephen Leake wrote: I don't believe there is a monotone that comes with MinGW. Indeed, I meant the cygwin which was clearly apparent to you from my version. Sorry for the confusion. type -a mtn $ type -a mtn mtn is /usr/bin/mtn mtn is /bin/mtn mtn is /cygdrive/k/Program Files/monotone/mtn mtn is /cygdrive/d/Program Files/monotone/mtn mtn is /cygdrive/k/Program Files/monotone/mtn mtn is /usr/bin/mtn As Timothy pointed out, the MinGW and Cygwin mtn's look for monotonerc and the keys directory in different places Indeed, however my use case is that I have a project which I am working on for my employer and I use the Windows version for (which works great) and the cygwin version which I use for working on Pidgin builds. I wanted a copy of the Guitone repository due to having a crash in it and just used the windows one which failed. While I was aware of the two different locations I can confirm that they contain the same information as I started my work project using the cygwin version (with the keys from there) and changed to the MinGW version. The monotonerc file in both locations just contains the get_passphrase function. The keys folder contains 2 keys. Is there something which would have permitted the cygwin one to work and the mingw one not too within any files found in the .monotone or monotone folders? Regards Phil Hannent signature.asc Description: OpenPGP digital signature ___ Monotone-devel mailing list Monotone-devel@nongnu.org http://lists.nongnu.org/mailman/listinfo/monotone-devel
