Prerequisite:
http://thread.gmane.org/gmane.comp.version-control.monotone.devel/4297
A user can make 2 types of merge decisions:
(1): One parent is better than the other (represented by *)
(2): Both parents are wrong (represented by ^)
Since there are 2 types of merge decisions, it would be bad
Benoît Dejean wrote:
(...)
> i can't find anything saying that string uses contiguous storage. Better
> use vector. So the following is buggy :
>
>
> +while(file.good())
> + {
> +buf.resize(bufsize);
> +file.read(&buf[0],bufsize);
>
I'm trying to import a CVS repository into monotone. All goes
seemingly well, in that there are no warnings or error messages.
However, when I check it out, I notice that a lot of the files are old
versions, and some are missing altogether. The set is not consistent
with any point in the past, ei
Le mercredi 24 août 2005 à 11:49 -0700, Eric Anderson a écrit :
> Summary: The attached patch changes the function which determines if a file
> Since guess_binary() took a string, I used the slightly questionable:
> &string[0] trick to get a writeable pointer to the string in
> file.read(&buf[0],
On Wed, 2005-08-24 at 22:01, Petr Ovtchenkov wrote:
> - support of STLport
> - set position of Boost's headers during configure
> - set position of Boost's libs during configure
most of these exist in similar form in post-0.22 code in the repository.
I'm looking through your changes to see if
Summary:
The attached patch (against monotone-0.22) add
- support of STLport
- set position of Boost's headers during configure
- set position of Boost's libs during configure
ChangeLog entry:
2005-08-24 Petr Ovtchenkov <[EMAIL PROTECTED]>
* Makefile.am: remove -DBOOST_DISABLE_T
Because I did not understand the emacs interface
to monotone as is provided in the contrib directory
I wrote my own.
Note that this is the first piece of elisp code of more
than a few lines, and it shows.
It is far from complete but does the basic job in simple
cases quite well.
I was planning
Summary: The attached patch changes the function which determines if a file
is binary from operating on a string to operating on a filename. This
avoids lua reading the entire file into memory if we can determine that
it is binary in the first few characters. The patch also creates a
fu
I am attempting to add a working copy of jikes to a monotone database.
When I added the directory 'jikes', which contains a sub directory
with two tarballs and an expanded source tree, I got this output:
monotone: adding attribute 'execute' to file jikes/jikes-1.22/
mkinstalldirs to .mt-attr
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.
14 matches
Mail list logo
