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

2012-04-20 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 postreview e'

 What info is sent to reviewboard?

The patch e' which also contains a reference to the parent d.

Now imagine that you send d-x-y-z where z is your patch and x and y are not 
public, two patches will be sent to RB: a parent patch which is the 
concatenation of x and y, which includes a reference to the public parent d, 
and the actual patch to review z.


 If d-f is pushed to the public repo from a different cloned repo where f
 conflicts with e', I see that conflict in the diff viewer page that worked
 prior to f being pushed.

Then you will have to merge e' and f. The other solutions would be to rebase 
e' on top of f, or apply e' as a patch on top of f.


 Is there a way to choose the changeset referenced in the public repo
 manually? (via hg reviewboard plug-in and/or via GUI)

It seems that the -m/--master option could do that. Never used it though.
Note that the plugin will send a parent patch from this specified master to 
your patch.


 kr

 On Wednesday, April 18, 2012 2:43:55 PM UTC-5, morisgi wrote:
  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 the ...didn't apply cleanly. message.
  
  
  1. Does RB intend to always apply the patch to a static changeset in
 
  the
 
  mercurial repo or, contrastingly, always to the tip?
  2. If RB applies patch to static changeset, what mechanism
   identifies the changeset upon which the patch applies?
  
   Thank you!
 
  Patch is applied to a static changeset.
 
  The Mercurial-Reviewboard walks the history up to find the first
  changeset known by the mercurial repository referenced from RB. The delta
  from this changeset to the parent of the patch is sent to RB along with
  the patch itself.
 
  Regards.
  Gilles.


-- 
Want to help the Review Board project? Donate today at 
http://www.reviewboard.org/donate/
Happy user? Let us know at http://www.reviewboard.org/users/
-~--~~~~--~~--~--~---
To unsubscribe from this group, send email to 
reviewboard+unsubscr...@googlegroups.com
For more options, visit this group at 
http://groups.google.com/group/reviewboard?hl=en


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

2012-04-18 Thread kredler
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 the ...didn't apply cleanly. message.


   1. Does RB intend to always apply the patch to a static changeset in the 
   mercurial repo or, contrastingly, always to the tip?
   2. If RB applies patch to static changeset, what mechanism identifies 
   the changeset upon which the patch applies?

Thank you!

-- 
Want to help the Review Board project? Donate today at 
http://www.reviewboard.org/donate/
Happy user? Let us know at http://www.reviewboard.org/users/
-~--~~~~--~~--~--~---
To unsubscribe from this group, send email to 
reviewboard+unsubscr...@googlegroups.com
For more options, visit this group at 
http://groups.google.com/group/reviewboard?hl=en

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 the ...didn't apply cleanly. message.


1. Does RB intend to always apply the patch to a static changeset in the
mercurial repo or, contrastingly, always to the tip?
2. If RB applies patch to static changeset, what mechanism identifies
the changeset upon which the patch applies?

 Thank you!

Patch is applied to a static changeset.

The Mercurial-Reviewboard walks the history up to find the first changeset 
known by the mercurial repository referenced from RB. The delta from this 
changeset to the parent of the patch is sent to RB along with the patch 
itself.

Regards.
Gilles.

-- 
Want to help the Review Board project? Donate today at 
http://www.reviewboard.org/donate/
Happy user? Let us know at http://www.reviewboard.org/users/
-~--~~~~--~~--~--~---
To unsubscribe from this group, send email to 
reviewboard+unsubscr...@googlegroups.com
For more options, visit this group at 
http://groups.google.com/group/reviewboard?hl=en


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 cloned repo where f 
conflicts with e', I see that conflict in the diff viewer page that worked 
prior to f being pushed.

Is there a way to choose the changeset referenced in the public repo 
manually? (via hg reviewboard plug-in and/or via GUI)

kr

On Wednesday, April 18, 2012 2:43:55 PM UTC-5, morisgi wrote:

 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 the ...didn't apply cleanly. message.
 
 
 1. Does RB intend to always apply the patch to a static changeset in 
 the
 mercurial repo or, contrastingly, always to the tip?
 2. If RB applies patch to static changeset, what mechanism identifies
 the changeset upon which the patch applies?
 
  Thank you!

 Patch is applied to a static changeset.

 The Mercurial-Reviewboard walks the history up to find the first changeset 
 known by the mercurial repository referenced from RB. The delta from this 
 changeset to the parent of the patch is sent to RB along with the patch 
 itself.

 Regards.
 Gilles.



-- 
Want to help the Review Board project? Donate today at 
http://www.reviewboard.org/donate/
Happy user? Let us know at http://www.reviewboard.org/users/
-~--~~~~--~~--~--~---
To unsubscribe from this group, send email to 
reviewboard+unsubscr...@googlegroups.com
For more options, visit this group at 
http://groups.google.com/group/reviewboard?hl=en