On Fri, Aug 26, 2005 at 10:23:02AM +0200, Christof Petig wrote:
> I see you working like hell on net.venge.monotone.rewrites.path_handling
> and I have merged my work (for now). Glad to see something done to this
> usability killer (experiencing this more often than once would make me
> look for di
Nathaniel Smith schrieb:
> So you're currently okay? If so, I wouldn't worry about it too much;
> we know there are these annoying bugs in some of these complicated
> merge topologies, and we know how we're going to solve them, just it
> will take a little bit to implement...
I see you working li
On Thu, Aug 25, 2005 at 11:07:46AM +0200, Christof Petig wrote:
> fails while explicitely merging via
>
> monotone explicit_merge e95be13d506eb955b465a30fe7ce192354018384
> 616ec315888dd5b791999730cf6dcece1f4a3820
> 44ed8807bead656889fb5022f974e13a7169098c net.venge.monotone.cvssync
>
> monotone
On Wed, 2005-08-24 at 09:38 +0200, Christof Petig wrote:
> Any idea on how to merge the changes in mainline (propagated to
> nvm.cvssync.win32) into net.venge.monotone.cvssync?
>
> When doing an explicit merge:
>
> mt explicit_merge 7b88f7c9b843cae0b068b5232edf812c9b2b367d
> 0772ad08e5a0c6593219f
Christof Petig schrieb:
> Christof Petig schrieb:
>
>>mt explicit_merge 7b88f7c9b843cae0b068b5232edf812c9b2b367d
>>0772ad08e5a0c6593219fb22e077929e36afc044
>>76a3c8d6e258681afd550ca3fed3cf776fe7a795 net.venge.monotone.cvssync
>>
>>*) This would lead to the conclusion that removing the added file
>
please do not reply to my previous post from [EMAIL PROTECTED]
which contained the attachment :-(
I wrote (as postmaster)
> Nathaniel Smith schrieb:
>> Doh! I thought we had MM()'s for those changesets already... that's
>> what was I was execpting to see in the dumpfile. I've just added them
>>
On Wed, Aug 24, 2005 at 12:13:32PM +0200, Christof Petig wrote:
> Nathaniel Smith schrieb:
> > Can we get a --dump? That should contain the inconsistent changesets
> > in question, which should give us some idea of where in particular the
> > problem is...
>
> With --debug via private mail? Since
Nathaniel Smith schrieb:
> Can we get a --dump? That should contain the inconsistent changesets
> in question, which should give us some idea of where in particular the
> problem is...
With --debug via private mail? Since the MT/debug file is only 10k
bzipped I'll send it to the list, too.
C
On Wed, Aug 24, 2005 at 09:38:07AM +0200, Christof Petig wrote:
> and resolving the first two conflicting files by hand (select third
> wherever necessary) I get this error. Since I did not mess with file
> renaming ... (perhaps the fact that I added/changed a file to/in the now
> removed netxx/ di
Any idea on how to merge the changes in mainline (propagated to
nvm.cvssync.win32) into net.venge.monotone.cvssync?
When doing an explicit merge:
mt explicit_merge 7b88f7c9b843cae0b068b5232edf812c9b2b367d
0772ad08e5a0c6593219fb22e077929e36afc044
76a3c8d6e258681afd550ca3fed3cf776fe7a795 net.venge.
10 matches
Mail list logo
