In message <[EMAIL PROTECTED]> on Wed, 21 Jun 2006 13:25:41 -0600, "Shaun
Jackman" <[EMAIL PROTECTED]> said:
sjackman> This diff applies against the tarball, not against a
sjackman> checkout of the monotone repository, so there are no
sjackman> examples files to include. If at all possible, I pre
Here's a little something I've been using lately. It's a hook definition
that allows monotone to use xxdiff as the external diff tool:
function external_diff(file_path, data_old, data_new, is_binary,
diff_args, rev_old, rev_new)
local old_file = write_to_temporary_file(data_old);
local new_f
One thing that I have always found to be tremendously helpful with various VCS is having some kind of "dry run" command. With CVS, even something as pedestrian as "cvs -nq update" is tremendously helpful to test the depth of the waters before you dive in head first.
If there is such a feature i
-BEGIN PGP SIGNED MESSAGE-
Hash: SHA1
Shawn Samuel wrote:
> I took a look and don't think I'll mind maintaining an official
> cygwin package.
No problems with that.
Do you want to create a package "installable with setup.exe" (even of
not official) or not a package at all?
(let me specify
"Hugo Cornelis" <[EMAIL PROTECTED]> writes:
> I followed this thread with a lot of interest. Is
> in-workspace-merge planned for the coming months or more something
> like a long term vision ? Could you give more information on the
> current development status of this feature (besides what is in
Nathaniel Smith <[EMAIL PROTECTED]> writes:
[...]
> I am not sure how you envision getting (1) and (2) simultaneously with
> (3), though. If we are not using the workspace to hold merge state,
> then where could we store the "work [you] have done up to that point"?
Presumably you'd have to comm
I followed this thread with a lot of interest. Is in-workspace-merge
planned for the coming months or more something like a long term
vision ? Could you give more information on the current development
status of this feature (besides what is in the wiki) ?
Hugo
On 6/21/06, Nathaniel Smith <[
On Wed, Jun 21, 2006 at 03:02:53PM +0200, Wim Oudshoorn wrote:
> Arg, I have manual merging with monotone 0.26.
>
> So now that is of my chest I can be more reasonable.
> What happened, I was doing a merge from two development
> lines which branched off quite a long time ago, and for
> some re
On 6/21/06, Thomas Keller <[EMAIL PROTECTED]> wrote:
Justin Patrin schrieb:
> 2 things. First, I would suggest trying monotone 0.27. It's much
> better for merge resolution (it shouldn't list as many things as
> having conflicts, IIRC). Second, if the conflicts you're seeing seem
> nonsensical, t
Justin Patrin schrieb:
2 things. First, I would suggest trying monotone 0.27. It's much
better for merge resolution (it shouldn't list as many things as
having conflicts, IIRC). Second, if the conflicts you're seeing seem
nonsensical, try monotone merge --lca.
mtn merge no longer has --lca (I t
On 6/21/06, Richard Levitte - VMS Whacker <[EMAIL PROTECTED]> wrote:
In message <[EMAIL PROTECTED]> on Wed, 21 Jun 2006 10:49:58 -0600, "Shaun Jackman"
<[EMAIL PROTECTED]> said:
sjackman> --- monotone-0.27.orig/debian/docs
sjackman> +++ monotone-0.27/debian/docs
sjackman> @@ -10,4 +10,3 @@
sjac
In message <[EMAIL PROTECTED]> on Wed, 21 Jun 2006 10:49:58 -0600, "Shaun
Jackman" <[EMAIL PROTECTED]> said:
sjackman> --- monotone-0.27.orig/debian/docs
sjackman> +++ monotone-0.27/debian/docs
sjackman> @@ -10,4 +10,3 @@
sjackman> contrib
sjackman> debian/README.Debian
sjackman> debian/TOD
Lapo,
One thing I guess I didn't state explicitly, but is a part of that
question:
Given that it's possible at all, what is general cygwin policy about
having a dependency on an older version of a package? I can understand
if it's not allowed at all since you could see various dependencies on
old
Hello,
I'm use XXdiff for merge. This tool shows the title "RUNNING" for all
the three files. It would be more help, to know my file, what is old
and what is the new from others.
--
Henry Nestler
___
Monotone-devel mailing list
Monotone-devel@no
On 5/13/06, Tomas Fasth <[EMAIL PROTECTED]> wrote:
I have managed to build and upload the latest version (0.26.0). I use the
pbuilder package and the pdebuild command to do clean environment builds. It
has been an easy task maintaining the monotone package. I have so far not
been trying to do aut
On 6/21/06, Wim Oudshoorn <[EMAIL PROTECTED]> wrote:
Arg, I have manual merging with monotone 0.26.
So now that is of my chest I can be more reasonable.
What happened, I was doing a merge from two development
lines which branched off quite a long time ago, and for
some reason I got lots of m
I took a look and don't think I'll mind maintaining an official cygwin
package. However, I have one main question that the Cygwin Package
Contributor's Guide didn't answer for me:
How do you require dependencies on older versions of a package? The
current build of cygwin dot.exe (graphviz, which m
Arg, I have manual merging with monotone 0.26.
So now that is of my chest I can be more reasonable.
What happened, I was doing a merge from two development
lines which branched off quite a long time ago, and for
some reason I got lots of merge conflicts. So I duly set
out to merge them.
Un
At 2006-06-21T00:01:30-0700, Howard Spindel wrote:
> mtn --full-version reports version 0.26. File date of mtn.exe is
> 6/10/2006. The installer executable is smaller than the 0.26 installer
> executable (which makes sense since the readme says the binary is
> smaller), so I think I have the corr
At 2006-06-20T23:54:32-0700, Howard Spindel wrote:
> mtn db check reports minor problems: 1 unreferenced file in one database,
> 2 unreferenced files in another. What does that mean? Should I fix it
> somehow?
It means that the file exists, but isn't referenced by any manifests.
> How do I dete
I just installed the Windows binary for 0.27.
mtn --full-version reports version 0.26. File date of mtn.exe is
6/10/2006. The installer executable is smaller than the 0.26
installer executable (which makes sense since the readme says the
binary is smaller), so I think I have the correct inst
21 matches
Mail list logo
