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
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
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/
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.
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
in
