On Fri, Jul 07, 2006 at 04:03:07PM +1000, Daniel Carosone wrote:
> port - or backport, crossport or similar..
or teleport, which led me to:
warpdiff - adjust/warp the diff shown by diff -r 1 -r 2 to the
current workspace. Shortens to warp like applydiff.
For CVS users, compa
On Thu, Jul 06, 2006 at 10:40:22PM -0600, Derek Scherger wrote:
> Graydon Hoare wrote:
> > I have a minor nit with the name: I think I really prefer the word
> > "apply" for this operation. Does anyone else have a preference?
>
> I think I prefer the dry, stodgy "apply" as well.
I can see the cri
On Fri, Jul 07, 2006 at 11:27:30AM +1000, Daniel Carosone wrote:
> I should probably write up a wiki page with some pretty diagrams to
> help illustrate this. I think I'll call it DaggyFixes :-)
Done. I had in mind creating the pics with graphviz, but the
ascii-art ones I ended up with turned out
Graydon Hoare wrote:
> I have a minor nit with the name: I think I really prefer the word
> "apply" for this operation. Does anyone else have a preference?
I think I prefer the dry, stodgy "apply" as well.
Cheers,
Derek
___
Monotone-devel mailing lis
On Thu, Jul 06, 2006 at 09:27:22PM +0100, Bruce Stephens wrote:
> >> Cool. Can rev1 be a descendent of rev2?
> >
> > Yes. rev1 and rev2 can be completely arbitrary (though one may or may
> > not find this freedom useful).
>
> Right. The specific case I was thinking of was reverting some change
Nathaniel Smith <[EMAIL PROTECTED]> writes:
> On Thu, Jul 06, 2006 at 11:00:04AM +0100, Bruce Stephens wrote:
>> Nathaniel Smith <[EMAIL PROTECTED]> writes:
>> > Usage is like 'mtn pluck -r rev1 -r rev2', which does essentially what
>> > 'mtn diff -r rev1 -r rev2 | patch -p0' does, except that it
-BEGIN PGP SIGNED MESSAGE-
Hash: SHA1
Justin Patrin schreef:
> A request:
> I was planning on making a wrapper script to my mtnpatch which did
> exactly what this does (pull changes from a rev and apply them with
> mtnpatch), but I will obviously not need that now. One thing I meant
> t
On 7/6/06, Koen Kooi <[EMAIL PROTECTED]> wrote:
-BEGIN PGP SIGNED MESSAGE-
Hash: SHA1
Graydon Hoare schreef:
> Nathaniel Smith wrote:
>> I just landed on mainline my branch to add a 'mtn pluck' command; it
>> lets you pluck some changes from an arbitrary place in history, and
>> drop the
-BEGIN PGP SIGNED MESSAGE-
Hash: SHA1
Graydon Hoare schreef:
> Nathaniel Smith wrote:
>> I just landed on mainline my branch to add a 'mtn pluck' command; it
>> lets you pluck some changes from an arbitrary place in history, and
>> drop them into your workspace. I.e., basic cherrypicking
Nathaniel Smith wrote:
I just landed on mainline my branch to add a 'mtn pluck' command; it
lets you pluck some changes from an arbitrary place in history, and
drop them into your workspace. I.e., basic cherrypicking support --
none of the fancy tracking stuff that a true cherrypicker, like darc
-BEGIN PGP SIGNED MESSAGE-
Hash: SHA1
On Thu, 6 Jul 2006 07:59:39 -0700
Nathaniel Smith <[EMAIL PROTECTED]> wrote:
> On Thu, Jul 06, 2006 at 03:37:03AM -0400, Daniel Dickinson wrote:
> > On Wed, 5 Jul 2006 17:20:04 -0700
> > Nathaniel Smith <[EMAIL PROTECTED]> wrote:
> > > Cool! Aside fr
On Thu, 2006-07-06 at 00:27 -0700, Zack Weinberg wrote:
> Next I plan to tackle dusting off Tim's old code on
> net.venge.monotone.workspace-merge, reconstructing it in tune with
> more recent stuff, and breaking it up into mergeable chunks. There
> are global API changes in there which should mak
On Thu, Jul 06, 2006 at 03:37:03AM -0400, Daniel Dickinson wrote:
> On Wed, 5 Jul 2006 17:20:04 -0700
> Nathaniel Smith <[EMAIL PROTECTED]> wrote:
> > Cool! Aside from being useful themselves, this gives us a much more
> > useful basis to talk about extensions to monotone to make this more
> > ele
On Thu, Jul 06, 2006 at 11:00:04AM +0100, Bruce Stephens wrote:
> Nathaniel Smith <[EMAIL PROTECTED]> writes:
> > Usage is like 'mtn pluck -r rev1 -r rev2', which does essentially what
> > 'mtn diff -r rev1 -r rev2 | patch -p0' does, except that it uses the
> > merger so it can merge through rename
Hi,
Is the code somewhere available, to take a look at it ?
/max
zi bin cheah wrote:
hello,
I've hacked into Darcs, and I m trying to create a Window > Preference
interface in Eclipse to allow monotone commit in Eclipse. Honestly, I m
stucked trying to make this part run.
I keep getting e
Hi,
Is the code available somewhere, to take a look at it ?
/max
zi bin cheah wrote:
hello,
I've hacked into Darcs, and I m trying to create a Window > Preference
interface in Eclipse to allow monotone commit in Eclipse. Honestly, I m
stucked trying to make this part run.
I keep getting e
-BEGIN PGP SIGNED MESSAGE-
Hash: SHA1
Nathaniel Smith schreef:
> I just landed on mainline my branch to add a 'mtn pluck' command; it
> lets you pluck some changes from an arbitrary place in history, and
> drop them into your workspace. I.e., basic cherrypicking support --
> none of the f
My current thinking is that this is a problem with mtn cat. Whether or not the get_system_linesep function is set it seems to output files ending in LF.
And of course, once that file is recommitted, that's how it stays - hence my confusion yesterday.
What's the procedure for adding this to t
Nathaniel Smith <[EMAIL PROTECTED]> writes:
[...]
> Usage is like 'mtn pluck -r rev1 -r rev2', which does essentially what
> 'mtn diff -r rev1 -r rev2 | patch -p0' does, except that it uses the
> merger so it can merge through renames, do graphical resolution on
> conflicts, and all that good stu
I just landed on mainline my branch to add a 'mtn pluck' command; it
lets you pluck some changes from an arbitrary place in history, and
drop them into your workspace. I.e., basic cherrypicking support --
none of the fancy tracking stuff that a true cherrypicker, like darcs,
has, but some people m
On Thursday 06 July 2006 05:39, Derek Scherger wrote:
> It seems rather odd to me (and some other folks on this list I believe)
> that, when run from within a subdirectory of the workspace, the ls
> commands list paths relative to the workspace root, rather than relative
> to the current directory.
I pushed out what I've got on diff -p; get it from
net.venge.monotone.diff-p branch. Issues yet to be resolved:
1) I'm using Lua pattern matching to find the enclosing functions. I
did this because the pattern to match comes from a Lua hook, so it
seemed most consistent to use that language's r
-BEGIN PGP SIGNED MESSAGE-
Hash: SHA1
On Wed, 5 Jul 2006 17:20:04 -0700
Nathaniel Smith <[EMAIL PROTECTED]> wrote:
>
> Cool! Aside from being useful themselves, this gives us a much more
> useful basis to talk about extensions to monotone to make this more
> elegant :-).
>
> Re: the "m
I'm still getting up to speed on the code. Last week I did one of the
quickie tasks, merging multiple heads with newer common ancestors
first; this is waiting for review on net.venge.monotone.multihead.
This week, on my local machine I have implemented diff -p support;
it's not ready for prime ti
24 matches
Mail list logo
