On Mon, Feb 12, 2007 at 03:31:50PM -0800, Arthur A. Gleckler wrote:
Because all of my files have existed since before I started using
Monotone, I have multiple versions of the same file.
[snip]
What's the right way to proceed here?
Right now the problem is that monotone thinks you
On Mon, Feb 12, 2007 at 10:19:57AM +0800, yinguohuang wrote:
I first install monotone 0.31 in debian by apt-get method.
However monotone 0.32 is required in OpenEmbedded,
This is only true if you want to use the OE.mtn that you download from their
site.
You can make your own, it just takes
Thanks a lot!
Problem has been resolved by downloading 0.32 mtn source and rebuilding
it.
Now mtn works well.
1. First, 0.31 mtn is installed at default in my debian linux, however,
0.32 mtn is required.
So I downlaod monotone_0.32-sarge0.1_i386.deb from mtn home page.
After intalling
-BEGIN PGP SIGNED MESSAGE-
Hash: SHA1
Jack Cummings schreef:
On Mon, Feb 12, 2007 at 10:19:57AM +0800, yinguohuang wrote:
I first install monotone 0.31 in debian by apt-get method.
However monotone 0.32 is required in OpenEmbedded,
This is only true if you want to use the OE.mtn
Ludovic Brenta wrote:
I just discovered that the problem only occurs with the cygwin binary
distribution of monotone. It does not occur with
monotone-0.32-setup.exe from venge.net.
The two have nothing in common: the one on venge.net is pure Win32 and
does not use CygWin. (whether this is
Arthur A. Gleckler wrote:
Is there any problem starting with
two versions of a file that don't, in fact, have a common ancestor in
Monotone?
Yes. In a merge, two nodes (files or dirs) can't have the same name, if they
don't share a common ancestor.
mtn: warning: rename target conflict:
Thomas == Thomas Moschny [EMAIL PROTECTED] writes:
CCing response to submitter as Thomas forgot :-(
Thomas Arthur A. Gleckler wrote:
Is there any problem starting with two versions of a file
that don't, in fact, have a common ancestor in Monotone?
Thomas Yes. In a merge,
Jack == Jack Cummings [EMAIL PROTECTED] writes:
Jack The last step takes over an hour on modern hardwar
Why does it take so long? I thought the bottleneck would be download
time, but here you suggest it is CPU time.
--
Brian May [EMAIL PROTECTED]
On 2/13/07, Brian May [EMAIL PROTECTED] wrote:
Jack == Jack Cummings [EMAIL PROTECTED] writes:
Jack The last step takes over an hour on modern hardwar
Why does it take so long? I thought the bottleneck would be download
time, but here you suggest it is CPU time.
The client has to do an
Hello,
As I would test openembedded software,
I followed instruction from this page :
http://www.openembedded.org/wiki/GettingStarted
I was trying to use monotone on a Debian GNU/Linux Testing up-to-date,
and got seg-fault when in ran such command:
[EMAIL PROTECTED]:/home/stuff$ mtn
On 2/11/07, Zack Weinberg [EMAIL PROTECTED] wrote:
I read through the new files - ssh_agent.hh, ssh_agent.cc, cmd_agent.cc.
My biggest concern has to do with the way you are serializing and
deserializing packets -- I think you're working way, way too hard.
You have a stream interface, and the
On Mon, Feb 12, 2007 at 10:19:57AM +0800, yinguohuang wrote:
error message:
mtn: fatal signal: segmentation fault
this is almost certainly a bug in monotone.
so I download monotone_0.32-sarge0.1_i386.deb and install it.
It looks like I forgot to make sure that the sarge .deb was
built with
On 2/13/07, Justin Patrin [EMAIL PROTECTED] wrote:
On 2/11/07, Zack Weinberg [EMAIL PROTECTED] wrote:
My biggest concern has to do with the way you are serializing and
deserializing packets -- I think you're working way, way too hard.
You have a stream interface, and the packet format seems
On 2/13/07, Zack Weinberg [EMAIL PROTECTED] wrote:
On 2/13/07, Justin Patrin [EMAIL PROTECTED] wrote:
On 2/11/07, Zack Weinberg [EMAIL PROTECTED] wrote:
My biggest concern has to do with the way you are serializing and
deserializing packets -- I think you're working way, way too hard.
You
This patch both verifies that the permissions on the key directory are
no greater (though currently warns), and gives a way to verify this in
the lua code (though I'm not sure where to use this at the moment).
Any thoughts? Should I just give up this line of thought? :)
-eric
mtn.diff
On Feb 13, 2007, at 12:35 AM, Jack Cummings wrote:
Right now the problem is that monotone thinks you are trying to
merge two
completely different files that happen to have the same name. This
probably
isn't what you want.
What you want to do is merge the content of two files. One way to
16 matches
Mail list logo
