Re: [Monotone-devel] merge_into_dir vs. diff?

[Timothy Brownawell]

Jeff Rizzo wrote:
> Let's say I've used merge_into_dir to create a branch composed of
> several other branches - development happens on the components, and
> is repeatedly merged back into the synthesized branch just fine.  If
> I diff one of the component branches against the synthesized branch,
> I get loads of output because of all the files that are not in the
> component I'm diffing from.
> 
> Is it feasible to add a flag or something to only diff against what
> would actually be merged if I were to propagate?  What I'm looking
> for, here, is a convenient way to tell what changes I'd be
> propagating...  or, if I had made changes to a component just on the
> synthesized branch, I'd like to see those too.
> 
> Is this doable?  I don't currently see how.

It *should* be possible to have diff only look at certain files:
   mtn diff -r h:component -r h:conglomerate path/to/component

However, this doesn't seem to be entirely working at the moment so you
might well be (mostly) stuck until it's fixed.

$ mtn -d src/monotone.mtn diff -r h:net.angrygoats.viewmtn -r
h:net.venge.monotone.contrib.webhost www/viewmtn
mtn: expanding selection 'h:net.angrygoats.viewmtn'
mtn: expanded to 'ff6f92608b076dabc1da2f37b4aa326f47a8a7eb'
mtn: expanding selection 'h:net.venge.monotone.contrib.webhost'
mtn: expanded to '203143a0aeeb28bfa8b96cd242482cc90d084f63'
mtn: warning: restriction excludes addition of 'www' but includes
addition of 'www/viewmtn'
mtn: fatal: error: ../roster.cc:2251: I(false)
mtn: this is almost certainly a bug in monotone.
mtn: please send this error message, the output of 'mtn version --full',
mtn: and a description of what you were doing to address@hidden
mtn: wrote debugging log to /home/tbrownaw/.monotone/dump
mtn: if reporting a bug, please include this file

$ mtn -d src/monotone.mtn diff -r h:net.venge.monotone.contrib.webhost
-r h:net.angrygoats.viewmtn www/viewmtn
mtn: expanding selection 'h:net.venge.monotone.contrib.webhost'
mtn: expanded to '203143a0aeeb28bfa8b96cd242482cc90d084f63'
mtn: expanding selection 'h:net.angrygoats.viewmtn'
mtn: expanded to 'ff6f92608b076dabc1da2f37b4aa326f47a8a7eb'
mtn: fatal: error: ../roster.cc:899: I(!has_root())
mtn: this is almost certainly a bug in monotone.
mtn: please send this error message, the output of 'mtn version --full',
mtn: and a description of what you were doing to address@hidden
mtn: wrote debugging log to /home/tbrownaw/.monotone/dump
mtn: if reporting a bug, please include this file