[PATCH 0 of 3] update: allow crossing branches without -c or -C (#5)

[Stuart W. Marks]

Hi Matt,

Any possibility of this patch series getting in before 1.4? Others have looked 
at the tests and the documentation, but I think people are waiting for you to 
look at the code, since you had looked at it before and had given substantial 
comments.

Thanks.

s'marks

Stuart W Marks wrote:
> Patch series to allow updating across branches without -c or -C, round
> five.
> 
> Round five includes portability fixes to the test-update-branches
> script to enable it to run on Ubuntu Linux, as suggested by Greg Ward.
> 
> Changes in round four:
> 
> The only changes from the previous series are changes to the third
> patch in the series, to the text of 'hg help update', in response to
> suggestions from Gilles Moris and timeless. (Thanks, guys!) The other
> patches are unchanged.
> 
> Changes in round three:
> 
> This series consists of three patches.
> 
> 1. Add a table of 'hg update' cases to comments in merge.py, and add
> tests for these cases.  This adds documentation and tests for the
> current behavior. This patch has no behavior changes.  Comments added
> and tests minimized compared to the previous patch series per request
> from mpm.
> 
> 2. Behavior changes and corresponding test changes to allow crossing of
> branches when a specific rev is given, when repo is clean, without
> requiring -c or -C.  Branch crossing will abort if no rev is given to
> 'hg update', per request from mpm.
> 
> 3. Modify 'hg help update' to reflect the above changes, plus general
> cleanup.
> 
> See discussion of the previous patch series, starting here:
> 
> http://www.selenic.com/pipermail/mercurial-devel/2009-September/015395.html
> 
> Please review and comment.
> 
> Thanks!
> 
> s'marks
> _______________________________________________
> Mercurial-devel mailing list
> Mercurial-devel at selenic.com
> http://selenic.com/mailman/listinfo/mercurial-devel
>