In message [EMAIL PROTECTED] on Sun, 15 Jan 2006 10:20:52 +0100 (CET),
Richard Levitte - VMS Whacker [EMAIL PROTECTED] said:
richard In message [EMAIL PROTECTED] on Sat, 14 Jan 2006 18:25:57 -0800,
Nathaniel Smith [EMAIL PROTECTED] said:
richard
richard njs On Sat, Jan 14, 2006 at 12:27:49PM
On Sun, Jan 15, 2006 at 10:20:52AM +0100, Richard Levitte - VMS Whacker wrote:
In message [EMAIL PROTECTED] on Sat, 14 Jan 2006 18:25:57 -0800, Nathaniel
Smith [EMAIL PROTECTED] said:
njs It isn't checked in to the source tree, and the versions in
njs distributed tarballs are really bad,
In message [EMAIL PROTECTED] on Sun, 15 Jan 2006 02:07:41 -0800, Nathaniel
Smith [EMAIL PROTECTED] said:
njs On Sun, Jan 15, 2006 at 10:20:52AM +0100, Richard Levitte - VMS Whacker
wrote:
njs I just know that every once in a while ('make dist', mostly) make
njs decides to regenerate the .po
Nathaniel Smith spake unto us the following wisdom:
On Sun, Jan 15, 2006 at 02:16:40PM +0100, Richard Levitte - VMS Whacker wrote:
Heh, on the other hand, the same thing usually happens to the
translators as well, and I guess the worst is when you end up with a
bunch of fuzzy entries.
On Sun, 2006-01-15 at 16:21 -0500, Yury Polyanskiy wrote:
Hey guys!
I'm rephrasing my last question.
I have a tree at some state. If I want to commit it as a child to ONE
revision I simply do echo $REVISION MT/revision; monotone commit.
Now HOW to commit a tree as a child to TWO
In message [EMAIL PROTECTED] on Sun, 15 Jan 2006 16:21:57 -0500, Yury
Polyanskiy [EMAIL PROTECTED] said:
ypolyans Now HOW to commit a tree as a child to TWO revisions? I.e. I
ypolyans want current revision to be a child of revA and revB (as if
ypolyans it were a merge, though I did all merging
On Sun, Jan 15, 2006 at 04:21:57PM -0500, Yury Polyanskiy wrote:
I'm rephrasing my last question.
I have a tree at some state. If I want to commit it as a child to ONE
revision I simply do echo $REVISION MT/revision; monotone commit.
Now HOW to commit a tree as a child to TWO revisions?
On Sun, Jan 15, 2006 at 11:56:45AM -0800, [EMAIL PROTECTED] wrote:
While doing a rather large netsync, I noticed the monotone ticker switch from
99 M to the rather unhelpful 0.1 G.
The following patch adds a few more steps in the kiB - MiB - GiB steps,
hopefully providing a bit more
Thanks all for replies!
I was 99% sure that the solution would be to commit my merged tree as a
child to revA and then call some fancy monotone db execute 'insert...'
to draw an additional edge in revision graph from revB to a newly
created revC.
Does anyone has a short explanation why such
On Sun, Jan 15, 2006 at 07:59:55PM -0500, Yury Polyanskiy wrote:
Thanks all for replies!
I was 99% sure that the solution would be to commit my merged tree as a
child to revA and then call some fancy monotone db execute 'insert...'
to draw an additional edge in revision graph from revB to a
On Sun, Jan 15, 2006 at 07:59:55PM -0500, Yury Polyanskiy wrote:
Thanks all for replies!
I was 99% sure that the solution would be to commit my merged tree as a
child to revA and then call some fancy monotone db execute 'insert...'
to draw an additional edge in revision graph from revB to a
Oh, ok. I knew I was missing something obvious. Sorry for not RTFMing
enough.
I'm not talking about a quick hack but rather a complete lossless
converter from BK to monotone. The way to do this is to either integrate
infamous SourcePuller (by A.Tridgell) inside monotone. However that
would
On Sun, Jan 15, 2006 at 09:21:27PM -0500, Yury Polyanskiy wrote:
The other way is to hack SP and make it call regular monotone commands.
In this latter case, of course it'd be nice if the tool worked with
standard monotone releases, not some specially patched ones. So I'm
just looking for a
On Mon, 2006-01-16 at 13:34 +1100, Daniel Carosone wrote:
On Sun, Jan 15, 2006 at 09:21:27PM -0500, Yury Polyanskiy wrote:
The other way is to hack SP and make it call regular monotone commands.
In this latter case, of course it'd be nice if the tool worked with
standard monotone releases,
On Sun, Jan 15, 2006 at 09:02:04PM -0600, Timothy Brownawell wrote:
Note that if monotone can merge a file without conflicts, then it
doesn't call the merge hook on that file at all.
Yes, you'll need to set manual_merge to true. A switch to merge to
imply this for all files in this commit is
On Sun, Jan 15, 2006 at 10:31:13PM -0500, Yury Polyanskiy wrote:
This won't handle all situations: suppose a merge revision that adds a
file. I can't direct monotone to add a new file via merge hook.
Correct. If you want to do this properly, I see basically two
options:
-- link in
16 matches
Mail list logo
