[PATCH stable] commands: fix help string for pull -u and unbundle -u

[Dan Villiom Podlaski Christiansen]

On 5 Jan 2010, at 21:08, Greg Ward wrote:

> commands: fix help string for pull -u and unbundle -u.
> 
> They update to new branch head, not new tip -- same as 'hg update'.

…

> -           _('update to new tip if changesets were pulled')),
> +           _('update to new branch head if changesets were pulled')),

Perhaps the logic should be explained more thoroughly? I wrote a small test for this — attached below — and the logic seems to be quite similar to that of clone…

>> $ ./test.sh

>> % creating a repository without a default branch
>> marked working directory as branch branch
>> adding x
>> marked working directory as branch otherbranch
>> adding y
>> 2010-01-06  anonymous  <anonymous>
>> 
>> 	* y:
>> 	2
>> 	[4a66b55760d5] [tip] <otherbranch>
>> 
>> 	* x:
>> 	1
>> 	[a906eab6a59e] <branch>
>> 
>> % creating a repository with a non-tip default branch
>> adding x
>> marked working directory as branch otherbranch
>> adding y
>> 2010-01-06  anonymous  <anonymous>
>> 
>> 	* y:
>> 	2
>> 	[fa711e8b4b49] [tip] <otherbranch>
>> 
>> 	* x:
>> 	1
>> 	[5e59b269d5b5]
>> 
>> % pulling and updating from the first repository
>> otherbranch
>> % pulling and updating from the second repository
>> default
>> % cloning the first repository
>> updating to branch otherbranch
>> 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
>> otherbranch
>> % cloning the second repository
>> updating to branch default
>> 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
>> default

--

Dan Villiom Podlaski Christiansen
danchr at gmail.com

-------------- next part --------------
A non-text attachment was scrubbed...
Name: test.sh
Type: application/octet-stream
Size: 1080 bytes
Desc: not available
URL: <http://selenic.com/pipermail/mercurial-devel/attachments/20100106/a16e7e9b/attachment.obj>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: smime.p7s
Type: application/pkcs7-signature
Size: 1943 bytes
Desc: not available
URL: <http://selenic.com/pipermail/mercurial-devel/attachments/20100106/a16e7e9b/attachment.bin>