[MERGE] implement `missing --revision 3..4 --my-revision 3..4`
Marius Kruger
amanic at gmail.com
Sun Jan 25 01:30:59 GMT 2009
2009/1/8 Ian Clatworthy <ian.clatworthy at internode.on.net>
> ...
> I also suspect that filtering on remote revisions will be more
> common than on local,
100% agree
> because pulling/merging/updating arguably
> happens more frequently that pushing, especially given Bazaar's
> bound branch support. So my suggestion is:
>
> * --revision, -r for remote revision filtering
> * --my-revision for this revision filtering.
yes please. done.
> I don't think the latter needs a shortcut.
done.
Please add a NEWS entry.
done.
> Please expand the missing help to include filtering examples.
done. (I gave it a shot but it can probably be improved)
> > + # clone and add a differing revision
> > + b_tree = a_tree.bzrdir.sprout('b').open_workingtree()
> > +
> > + for i in range(2, 6):
>
> s/a differing revision/differing revisions/
done.
> + out,err = self.run_bzr('missing ../b -r 2', retcode=1)
> > + self.assertMessages(out, ('a2', 'b2', 'b3', 'b4', 'b5'),
> ('a3',))
>
> So if just one limit is given, it's implicitly an upper one?
no, it behaves like `bzr log -r 2` i.e. it will only return revision 2.
I had expected it to be the lower one with the upper limit being
> the last in that branch. (If I'm right, there's a bug, right?)
I updated the test and missing documentation to reflect this behaviour
better
(I borrowed some documentation from cmd_log).
> > +
> > + self.assertUnmerged([], [('4', 'rev6', 0)],
> > + tree.branch, tree2.branch, 'all',
> > + include_merges=True, remote_revid_range=(rev6, rev6))
>
> You could probably drop the 'all' parameter as you've done
> elsewhere.
I removed 'all' of them now.
> > + self.assertUnmerged([], [('3', 'rev3',0 ), ('3.1.1', 'rev4',
> 1)],
>
> add space after ,.
done.
> > + self.assertUnmerged([], [('4', 'rev6', 0),('3.1.2', 'rev5', 1)],
>
done.
Thanx a lot for the review!
--
<| regards
U| Marius
H| <><
-------------- next part --------------
An HTML attachment was scrubbed...
URL: https://lists.ubuntu.com/archives/bazaar/attachments/20090125/e6fd8493/attachment-0001.htm
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 20090125_0324-bzr.missing_revision.patch
Type: text/x-diff
Size: 33658 bytes
Desc: not available
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20090125/e6fd8493/attachment-0001.bin
More information about the bazaar
mailing list