Re: diff_view page applying patch to tip of branch (and finding conflicts)

2012-04-19 Thread Gilles Moris
Hello, On Wednesday 18 April 2012 10:30:34 pm kredler wrote: > Thanks for confirming! > > Can you provide a more verbose CLI example/explanation, please? > > suppose a->b->c->d is public > changeset d->e' is made and posted using hg reviewboard plugin > > What command should be used? hg postrevie

Re: diff_view page applying patch to tip of branch (and finding conflicts)

2012-04-18 Thread kredler
Thanks for confirming! Can you provide a more verbose CLI example/explanation, please? suppose a->b->c->d is public changeset d->e' is made and posted using hg reviewboard plugin What command should be used? What info is sent to reviewboard? If d->f is pushed to the public repo from a different

Re: diff_view page applying patch to tip of branch (and finding conflicts)

2012-04-18 Thread Gilles Moris
On Wednesday 18 April 2012 07:46:19 pm kredler wrote: > Using mercurial repo and 'hg postreview ...'. > > If a patch applies cleanly to the tip of the branch, the view_diff page > works correctly. > However, if the files change in the branch subsequent to the RB post, I get > a patch collision and