On Mon, Jan 16, 2006 at 07:32:15PM -0500, Yury Polyanskiy wrote:
but propagate from devel to mainline still suffers from lack of
merge-via-working-dir as you say.
It was really a shock to me when after so much excitement about the
design of monotone I found that once I had a merge conflict
On Sun, Jan 15, 2006 at 10:31:15PM -0800, Justin Patrin wrote:
On 1/15/06, Nathaniel Smith [EMAIL PROTECTED] wrote:
If you do go the external program direction, it might be worthwhile
to see if it can be made somewhat general; most of the code involved
in importing from BK is probably the
I think having another flame war with LM is pointless -- they didn't
touch Andrew because he is under the cover of OSDL.
So external tool is still safer. Especially given that this is a one
time task. I mean nobody uses BK anymore so this tool'd be used only for
one-time conversion from BK to
Nathaniel Smith wrote:
As I understand, tailor does work with monotone as both a source and a
target; but tailor can only handle linear histories. Even if
transferring from one DAG VCS to another, it has to throw away
everything except a single linear subgraph.
This could presumably be fixed.
Daniel Carosone spake unto us the following wisdom:
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.
Yeah, but on the other hand I don't
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, not some specially patched ones. So I'm
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?
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
17 matches
Mail list logo
